From f66b655ff553e91746681eb497ec67360a9a2e23 Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 8 Jan 2026 10:42:47 -0500 Subject: [PATCH 1/5] Remove unnecessary new Mockito dependency --- eng/versioning/external_dependencies.txt | 7 -- sdk/ai/azure-ai-voicelive/pom.xml | 18 ---- .../voicelive/VoiceLiveAsyncClientTest.java | 38 +++----- .../voicelive/VoiceLiveClientBuilderTest.java | 36 ++------ .../VoiceLiveSessionOptionsTest.java | 6 +- .../ai/voicelive/models/FunctionToolTest.java | 10 +-- .../voicelive/models/MCPServerEventTest.java | 22 +++-- .../ai/voicelive/models/MCPServerTest.java | 3 +- .../voicelive/models/MaxOutputTokensTest.java | 89 ++++++------------- .../ai/voicelive/models/OpenAIVoiceTest.java | 4 +- .../ResponseMCPApprovalRequestItemTest.java | 14 ++- .../ResponseMCPApprovalResponseItemTest.java | 18 ++-- .../models/ResponseMCPCallItemTest.java | 14 ++- .../models/ResponseMCPListToolItemTest.java | 15 ++-- 14 files changed, 91 insertions(+), 203 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 79f376900df6..22a9a60ffe89 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -396,10 +396,3 @@ springboot3_ch.qos.logback:logback-classic;1.5.22 # Used for Spring version updates springboot3_org.springframework.boot:spring-boot-dependencies;3.5.9 springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.0.1 - -# Java 7 support - -# Jackson dropped support for Java 7 with the release of 2.14.0. -# Add custom Jackson dependencies for Track 1 libraries using Jackson. -org.mockito:mockito-junit-jupiter;4.11.0 -com.github.tomakehurst:wiremock-jre8;2.35.2 diff --git a/sdk/ai/azure-ai-voicelive/pom.xml b/sdk/ai/azure-ai-voicelive/pom.xml index 798fbf648666..09e6a995d553 100644 --- a/sdk/ai/azure-ai-voicelive/pom.xml +++ b/sdk/ai/azure-ai-voicelive/pom.xml @@ -76,29 +76,11 @@ Code generated by Microsoft (R) TypeSpec Code Generator. 5.13.4 test - - org.mockito - mockito-core - 4.11.0 - test - - - org.mockito - mockito-junit-jupiter - 4.11.0 - test - io.projectreactor reactor-test 3.7.11 test - - com.github.tomakehurst - wiremock-jre8 - 2.35.2 - test - diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveAsyncClientTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveAsyncClientTest.java index f71306338a6a..1e7dd44e03bf 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveAsyncClientTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveAsyncClientTest.java @@ -8,9 +8,6 @@ import com.azure.core.http.HttpHeaders; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; import reactor.core.publisher.Mono; import java.net.URI; @@ -23,14 +20,9 @@ /** * Unit tests for {@link VoiceLiveAsyncClient}. */ -@ExtendWith(MockitoExtension.class) class VoiceLiveAsyncClientTest { - - @Mock - private KeyCredential mockKeyCredential; - - @Mock - private HttpHeaders mockHeaders; + private final KeyCredential mockKeyCredential = new KeyCredential("fake"); + private final HttpHeaders mockHeaders = new HttpHeaders(); private URI testEndpoint; private VoiceLiveAsyncClient client; @@ -50,17 +42,15 @@ void testConstructorWithValidParameters() { @Test void testConstructorWithNullEndpoint() { // Act & Assert - assertThrows(NullPointerException.class, () -> { - new VoiceLiveAsyncClient(null, mockKeyCredential, "2024-10-01-preview", mockHeaders); - }); + assertThrows(NullPointerException.class, + () -> new VoiceLiveAsyncClient(null, mockKeyCredential, "2024-10-01-preview", mockHeaders)); } @Test void testConstructorWithNullCredential() { // Act & Assert - assertThrows(NullPointerException.class, () -> { - new VoiceLiveAsyncClient(testEndpoint, (KeyCredential) null, "2024-10-01-preview", mockHeaders); - }); + assertThrows(NullPointerException.class, + () -> new VoiceLiveAsyncClient(testEndpoint, (KeyCredential) null, "2024-10-01-preview", mockHeaders)); } @Test @@ -79,9 +69,7 @@ void testStartSessionWithValidOptions() { @Test void testStartSessionWithNullOptions() { // Act & Assert - assertThrows(NullPointerException.class, () -> { - client.startSession((String) null); - }); + assertThrows(NullPointerException.class, () -> client.startSession(null)); } @Test @@ -98,9 +86,7 @@ void testStartSessionWithModelString() { @Test void testStartSessionWithNullModel() { // Act & Assert - assertThrows(NullPointerException.class, () -> { - client.startSession((String) null); - }); + assertThrows(NullPointerException.class, () -> client.startSession(null)); } @Test @@ -140,13 +126,9 @@ void testOptimizedConnectMethods() { }); // Test null parameter validation for startSession methods - assertThrows(NullPointerException.class, () -> { - client.startSession((String) null); - }); + assertThrows(NullPointerException.class, () -> client.startSession(null)); - assertThrows(NullPointerException.class, () -> { - client.startSession((String) null); - }); + assertThrows(NullPointerException.class, () -> client.startSession(null)); } @Test diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveClientBuilderTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveClientBuilderTest.java index ccbba54f414c..fba37e9665cf 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveClientBuilderTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveClientBuilderTest.java @@ -5,13 +5,9 @@ import com.azure.core.credential.KeyCredential; import com.azure.core.credential.TokenCredential; -import com.azure.core.http.HttpClient; -import com.azure.core.util.Configuration; +import com.azure.core.test.utils.MockTokenCredential; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -21,20 +17,9 @@ /** * Unit tests for {@link VoiceLiveClientBuilder}. */ -@ExtendWith(MockitoExtension.class) class VoiceLiveClientBuilderTest { - - @Mock - private KeyCredential mockKeyCredential; - - @Mock - private TokenCredential mockTokenCredential; - - @Mock - private HttpClient mockHttpClient; - - @Mock - private Configuration mockConfiguration; + private final KeyCredential mockKeyCredential = new KeyCredential("fake"); + private final TokenCredential mockTokenCredential = new MockTokenCredential(); private VoiceLiveClientBuilder clientBuilder; @@ -74,17 +59,15 @@ void testBuilderWithValidEndpointAndTokenCredential() { @Test void testBuilderWithNullEndpoint() { // Act & Assert - assertThrows(NullPointerException.class, () -> { - clientBuilder.endpoint(null).credential(mockKeyCredential).buildAsyncClient(); - }); + assertThrows(NullPointerException.class, + () -> clientBuilder.endpoint(null).credential(mockKeyCredential).buildAsyncClient()); } @Test void testBuilderWithInvalidEndpoint() { // Act & Assert - assertThrows(IllegalArgumentException.class, () -> { - clientBuilder.endpoint("http:// invalid-url").credential(mockKeyCredential).buildAsyncClient(); - }); + assertThrows(IllegalArgumentException.class, + () -> clientBuilder.endpoint("http:// invalid-url").credential(mockKeyCredential).buildAsyncClient()); } @Test @@ -93,9 +76,8 @@ void testBuilderWithNullCredential() { String endpoint = "https://test.cognitiveservices.azure.com"; // Act & Assert - assertThrows(NullPointerException.class, () -> { - clientBuilder.endpoint(endpoint).credential((KeyCredential) null).buildAsyncClient(); - }); + assertThrows(NullPointerException.class, + () -> clientBuilder.endpoint(endpoint).credential((KeyCredential) null).buildAsyncClient()); } @Test diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveSessionOptionsTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveSessionOptionsTest.java index 3f9b66b7ea77..63e0bbcb3f8b 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveSessionOptionsTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/VoiceLiveSessionOptionsTest.java @@ -12,14 +12,11 @@ import com.azure.ai.voicelive.models.ServerVadTurnDetection; import com.azure.ai.voicelive.models.ToolChoiceSelection; import com.azure.ai.voicelive.models.VoiceLiveFunctionDefinition; -import com.azure.ai.voicelive.models.VoiceLiveToolDefinition; import com.azure.ai.voicelive.models.VoiceLiveSessionOptions; +import com.azure.ai.voicelive.models.VoiceLiveToolDefinition; import com.azure.core.util.BinaryData; - import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.List; @@ -33,7 +30,6 @@ /** * Unit tests for {@link VoiceLiveSessionOptions}. */ -@ExtendWith(MockitoExtension.class) class VoiceLiveSessionOptionsTest { private VoiceLiveSessionOptions sessionOptions; diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/FunctionToolTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/FunctionToolTest.java index cdca51c506ef..fbc20f63c954 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/FunctionToolTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/FunctionToolTest.java @@ -52,9 +52,7 @@ void testSetAndGetDescription() { @Test void testSetDescriptionWithNull() { // Act & Assert - assertDoesNotThrow(() -> { - functionTool.setDescription(null); - }); + assertDoesNotThrow(() -> functionTool.setDescription(null)); assertNull(functionTool.getDescription()); } @@ -84,9 +82,7 @@ void testSetAndGetParameters() { @Test void testSetParametersWithNull() { // Act & Assert - assertDoesNotThrow(() -> { - functionTool.setParameters(null); - }); + assertDoesNotThrow(() -> functionTool.setParameters(null)); assertNull(functionTool.getParameters()); } @@ -172,7 +168,7 @@ void testEqualsAndHashCode() { assertNotEquals(tool1, tool3); // Test with null - assertNotEquals(tool1, null); + assertNotNull(tool1); } } diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MCPServerEventTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MCPServerEventTest.java index da6b4ad217a4..b7a04394c10d 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MCPServerEventTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MCPServerEventTest.java @@ -6,8 +6,6 @@ import com.azure.core.util.BinaryData; import org.junit.jupiter.api.Test; -import java.io.IOException; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -17,7 +15,7 @@ class MCPServerEventTest { @Test - void testServerEventMcpListToolsInProgress() throws IOException { + void testServerEventMcpListToolsInProgress() { // Arrange String json = "{" + "\"event_id\":\"evt-1\"," + "\"type\":\"mcp_list_tools.in_progress\"," + "\"item_id\":\"item-123\"" + "}"; @@ -34,7 +32,7 @@ void testServerEventMcpListToolsInProgress() throws IOException { } @Test - void testServerEventMcpListToolsCompleted() throws IOException { + void testServerEventMcpListToolsCompleted() { // Arrange String json = "{" + "\"event_id\":\"evt-2\"," + "\"type\":\"mcp_list_tools.completed\"," + "\"item_id\":\"item-456\"" + "}"; @@ -51,7 +49,7 @@ void testServerEventMcpListToolsCompleted() throws IOException { } @Test - void testServerEventMcpListToolsFailed() throws IOException { + void testServerEventMcpListToolsFailed() { // Arrange String json = "{" + "\"event_id\":\"evt-3\"," + "\"type\":\"mcp_list_tools.failed\"," + "\"item_id\":\"item-789\"" + "}"; @@ -67,7 +65,7 @@ void testServerEventMcpListToolsFailed() throws IOException { } @Test - void testServerEventResponseMcpCallArgumentsDelta() throws IOException { + void testServerEventResponseMcpCallArgumentsDelta() { // Arrange String json = "{" + "\"event_id\":\"evt-4\"," + "\"type\":\"response.mcp_call_arguments.delta\"," + "\"item_id\":\"call-item-1\"," + "\"response_id\":\"resp-1\"," + "\"output_index\":0," @@ -88,7 +86,7 @@ void testServerEventResponseMcpCallArgumentsDelta() throws IOException { } @Test - void testServerEventResponseMcpCallArgumentsDeltaWithObfuscation() throws IOException { + void testServerEventResponseMcpCallArgumentsDeltaWithObfuscation() { // Arrange String json = "{" + "\"event_id\":\"evt-5\"," + "\"type\":\"response.mcp_call_arguments.delta\"," + "\"item_id\":\"call-item-2\"," + "\"response_id\":\"resp-2\"," + "\"output_index\":1," @@ -105,7 +103,7 @@ void testServerEventResponseMcpCallArgumentsDeltaWithObfuscation() throws IOExce } @Test - void testServerEventResponseMcpCallArgumentsDone() throws IOException { + void testServerEventResponseMcpCallArgumentsDone() { // Arrange String json = "{" + "\"event_id\":\"evt-6\"," + "\"type\":\"response.mcp_call_arguments.done\"," + "\"item_id\":\"call-item-3\"," + "\"response_id\":\"resp-3\"," + "\"output_index\":0," @@ -126,7 +124,7 @@ void testServerEventResponseMcpCallArgumentsDone() throws IOException { } @Test - void testJsonRoundTripForInProgress() throws IOException { + void testJsonRoundTripForInProgress() { // Arrange String originalJson = "{" + "\"event_id\":\"round-trip-1\"," + "\"type\":\"mcp_list_tools.in_progress\"," + "\"item_id\":\"item-rt\"" + "}"; @@ -146,7 +144,7 @@ void testJsonRoundTripForInProgress() throws IOException { } @Test - void testJsonRoundTripForArgumentsDelta() throws IOException { + void testJsonRoundTripForArgumentsDelta() { // Arrange String originalJson = "{" + "\"event_id\":\"round-trip-2\"," + "\"type\":\"response.mcp_call_arguments.delta\"," + "\"item_id\":\"item-delta\"," + "\"response_id\":\"resp-delta\"," + "\"output_index\":2," @@ -167,7 +165,7 @@ void testJsonRoundTripForArgumentsDelta() throws IOException { } @Test - void testComplexArgumentsInDone() throws IOException { + void testComplexArgumentsInDone() { // Arrange String complexArgs = "{\"nested\":{\"array\":[1,2,3]},\"string\":\"value\",\"bool\":true}"; String json = "{" + "\"event_id\":\"evt-complex\"," + "\"type\":\"response.mcp_call_arguments.done\"," @@ -183,7 +181,7 @@ void testComplexArgumentsInDone() throws IOException { } @Test - void testMultipleDeltaEvents() throws IOException { + void testMultipleDeltaEvents() { // Simulate streaming multiple delta events String[] deltas = { "{\"event_id\":\"evt-7\",\"type\":\"response.mcp_call_arguments.delta\",\"item_id\":\"stream-1\",\"response_id\":\"resp-7\",\"output_index\":0,\"delta\":\"{\"}", diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MCPServerTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MCPServerTest.java index 217066cd97d0..40bc9ec6ccfa 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MCPServerTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MCPServerTest.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -137,7 +138,7 @@ void testSetAndGetAllowedTools() { @Test void testSetAllowedToolsWithEmptyList() { // Arrange - List emptyList = Arrays.asList(); + List emptyList = Collections.emptyList(); // Act mcpServer.setAllowedTools(emptyList); diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MaxOutputTokensTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MaxOutputTokensTest.java index e14979fb8686..276530d525c1 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MaxOutputTokensTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/MaxOutputTokensTest.java @@ -6,15 +6,17 @@ import com.azure.core.util.BinaryData; import com.azure.json.JsonProviders; import com.azure.json.JsonReader; -import com.azure.json.JsonWriter; import org.junit.jupiter.api.Test; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.nio.charset.StandardCharsets; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Unit tests for {@link MaxOutputTokens}. @@ -104,12 +106,12 @@ void testEqualsAndHashCode() { assertNotEquals(tokens3, infinite1); // Test with null - assertNotEquals(tokens1, null); - assertNotEquals(infinite1, null); + assertNotNull(tokens1); + assertNotNull(infinite1); // Test with different type - assertNotEquals(tokens1, "100"); - assertNotEquals(infinite1, "inf"); + assertNotEquals("100", tokens1); + assertNotEquals("inf", infinite1); } @Test @@ -124,15 +126,11 @@ void testToString() { void testJsonSerializationWithInteger() throws IOException { // Arrange MaxOutputTokens tokens = MaxOutputTokens.of(100); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); // Act - try (JsonWriter writer = JsonProviders.createWriter(outputStream)) { - tokens.toJson(writer); - } + String json = tokens.toJsonString(); // Assert - String json = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); assertEquals("100", json); } @@ -140,15 +138,11 @@ void testJsonSerializationWithInteger() throws IOException { void testJsonSerializationWithInfinite() throws IOException { // Arrange MaxOutputTokens tokens = MaxOutputTokens.infinite(); - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); // Act - try (JsonWriter writer = JsonProviders.createWriter(outputStream)) { - tokens.toJson(writer); - } + String json = tokens.toJsonString(); // Assert - String json = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); assertEquals("\"inf\"", json); } @@ -156,11 +150,10 @@ void testJsonSerializationWithInfinite() throws IOException { void testJsonDeserializationWithInteger() throws IOException { // Arrange String json = "100"; - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); // Act MaxOutputTokens tokens; - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { tokens = MaxOutputTokens.fromJson(reader); } @@ -174,11 +167,10 @@ void testJsonDeserializationWithInteger() throws IOException { void testJsonDeserializationWithInfinite() throws IOException { // Arrange String json = "\"inf\""; - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); // Act MaxOutputTokens tokens; - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { tokens = MaxOutputTokens.fromJson(reader); } @@ -192,11 +184,10 @@ void testJsonDeserializationWithInfinite() throws IOException { void testJsonDeserializationWithNull() throws IOException { // Arrange String json = "null"; - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); // Act MaxOutputTokens tokens; - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { tokens = MaxOutputTokens.fromJson(reader); } @@ -208,10 +199,9 @@ void testJsonDeserializationWithNull() throws IOException { void testJsonDeserializationWithInvalidString() throws IOException { // Arrange String json = "\"invalid\""; - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); // Act & Assert - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { assertThrows(IllegalArgumentException.class, () -> MaxOutputTokens.fromJson(reader)); } } @@ -220,10 +210,9 @@ void testJsonDeserializationWithInvalidString() throws IOException { void testJsonDeserializationWithInvalidType() throws IOException { // Arrange String json = "true"; - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); // Act & Assert - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { assertThrows(IllegalArgumentException.class, () -> MaxOutputTokens.fromJson(reader)); } } @@ -234,16 +223,11 @@ void testJsonRoundTripWithInteger() throws IOException { MaxOutputTokens original = MaxOutputTokens.of(2048); // Act - Serialize - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try (JsonWriter writer = JsonProviders.createWriter(outputStream)) { - original.toJson(writer); - } + String json = original.toJsonString(); // Act - Deserialize - String json = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); MaxOutputTokens deserialized; - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { deserialized = MaxOutputTokens.fromJson(reader); } @@ -259,16 +243,11 @@ void testJsonRoundTripWithInfinite() throws IOException { MaxOutputTokens original = MaxOutputTokens.infinite(); // Act - Serialize - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try (JsonWriter writer = JsonProviders.createWriter(outputStream)) { - original.toJson(writer); - } + String json = original.toJsonString(); // Act - Deserialize - String json = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); MaxOutputTokens deserialized; - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { deserialized = MaxOutputTokens.fromJson(reader); } @@ -285,13 +264,9 @@ void testIntegrationWithResponseCreateParams() throws IOException { params.setMaxOutputTokens(BinaryData.fromObject(MaxOutputTokens.of(1000))); // Act - Serialize - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try (JsonWriter writer = JsonProviders.createWriter(outputStream)) { - params.toJson(writer); - } + String json = params.toJsonString(); // Assert - Check that maxOutputTokens is serialized as integer - String json = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); assertTrue(json.contains("\"max_output_tokens\":1000") || json.contains("\"max_output_tokens\": 1000")); } @@ -302,13 +277,9 @@ void testIntegrationWithResponseCreateParamsInfinite() throws IOException { params.setMaxOutputTokens(BinaryData.fromObject(MaxOutputTokens.infinite())); // Act - Serialize - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try (JsonWriter writer = JsonProviders.createWriter(outputStream)) { - params.toJson(writer); - } + String json = params.toJsonString(); // Assert - Check that maxOutputTokens is serialized as string "inf" - String json = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); assertTrue(json.contains("\"max_output_tokens\":\"inf\"") || json.contains("\"max_output_tokens\": \"inf\"")); } @@ -319,13 +290,9 @@ void testIntegrationWithResponseCreateParamsNull() throws IOException { params.setMaxOutputTokens(null); // Act - Serialize - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try (JsonWriter writer = JsonProviders.createWriter(outputStream)) { - params.toJson(writer); - } + String json = params.toJsonString(); // Assert - Check that maxOutputTokens is not included when null - String json = new String(outputStream.toByteArray(), StandardCharsets.UTF_8); // The field should not be present or should be null in the JSON // Depending on the JsonWriter implementation, it might omit null fields assertNotNull(json); @@ -335,11 +302,10 @@ void testIntegrationWithResponseCreateParamsNull() throws IOException { void testDeserializeResponseCreateParamsWithInteger() throws IOException { // Arrange String json = "{\"max_output_tokens\":500}"; - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); // Act ResponseCreateParams params; - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { params = ResponseCreateParams.fromJson(reader); } @@ -355,11 +321,10 @@ void testDeserializeResponseCreateParamsWithInteger() throws IOException { void testDeserializeResponseCreateParamsWithInfinite() throws IOException { // Arrange String json = "{\"max_output_tokens\":\"inf\"}"; - ByteArrayInputStream inputStream = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); // Act ResponseCreateParams params; - try (JsonReader reader = JsonProviders.createReader(inputStream)) { + try (JsonReader reader = JsonProviders.createReader(json)) { params = ResponseCreateParams.fromJson(reader); } diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/OpenAIVoiceTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/OpenAIVoiceTest.java index 2d83ba4ab829..ec359c09b418 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/OpenAIVoiceTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/OpenAIVoiceTest.java @@ -78,10 +78,10 @@ void testEqualsAndHashCode() { assertNotEquals(voice1, voice3); // Test with null - assertNotEquals(voice1, null); + assertNotNull(voice1); // Test with different type - assertNotEquals(voice1, "not a voice"); + assertNotEquals("not a voice", voice1); } } diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPApprovalRequestItemTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPApprovalRequestItemTest.java index 9e45fa784a04..083ccd097a78 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPApprovalRequestItemTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPApprovalRequestItemTest.java @@ -6,8 +6,6 @@ import com.azure.core.util.BinaryData; import org.junit.jupiter.api.Test; -import java.io.IOException; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -18,7 +16,7 @@ class ResponseMCPApprovalRequestItemTest { @Test - void testFromJsonWithRequiredFields() throws IOException { + void testFromJsonWithRequiredFields() { // Arrange String json = "{" + "\"id\":\"approval-req-1\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_request\"," @@ -37,7 +35,7 @@ void testFromJsonWithRequiredFields() throws IOException { } @Test - void testFromJsonWithArguments() throws IOException { + void testFromJsonWithArguments() { // Arrange String json = "{" + "\"id\":\"approval-req-2\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_request\"," + "\"name\":\"delete-tool\"," + "\"server_label\":\"admin-server\"," @@ -56,7 +54,7 @@ void testFromJsonWithArguments() throws IOException { } @Test - void testTypeIsAlwaysMcpApprovalRequest() throws IOException { + void testTypeIsAlwaysMcpApprovalRequest() { // Arrange String json = "{" + "\"id\":\"approval-3\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_request\"," + "\"name\":\"tool\"," + "\"server_label\":\"server\"" + "}"; @@ -70,7 +68,7 @@ void testTypeIsAlwaysMcpApprovalRequest() throws IOException { } @Test - void testWithNullArguments() throws IOException { + void testWithNullArguments() { // Arrange String json = "{" + "\"id\":\"approval-4\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_request\"," @@ -86,7 +84,7 @@ void testWithNullArguments() throws IOException { } @Test - void testJsonRoundTrip() throws IOException { + void testJsonRoundTrip() { // Arrange String originalJson = "{" + "\"id\":\"round-trip-id\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_request\"," + "\"name\":\"backup-tool\"," + "\"server_label\":\"backup-server\"," @@ -108,7 +106,7 @@ void testJsonRoundTrip() throws IOException { } @Test - void testComplexToolArguments() throws IOException { + void testComplexToolArguments() { // Arrange String complexArgs = "{\"operation\":\"delete\",\"resources\":[\"id1\",\"id2\"],\"force\":true}"; String json = "{" + "\"id\":\"complex-approval\"," + "\"object\":\"session.item\"," diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPApprovalResponseItemTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPApprovalResponseItemTest.java index a30a83a12674..e388f4907bcd 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPApprovalResponseItemTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPApprovalResponseItemTest.java @@ -6,8 +6,6 @@ import com.azure.core.util.BinaryData; import org.junit.jupiter.api.Test; -import java.io.IOException; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -20,7 +18,7 @@ class ResponseMCPApprovalResponseItemTest { @Test - void testFromJsonWithApprove() throws IOException { + void testFromJsonWithApprove() { // Arrange String json = "{" + "\"id\":\"response-1\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_response\"," + "\"approval_request_id\":\"req-123\"," + "\"approve\":true" + "}"; @@ -38,7 +36,7 @@ void testFromJsonWithApprove() throws IOException { } @Test - void testFromJsonWithDeny() throws IOException { + void testFromJsonWithDeny() { // Arrange String json = "{" + "\"id\":\"response-2\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_response\"," @@ -56,7 +54,7 @@ void testFromJsonWithDeny() throws IOException { } @Test - void testFromJsonWithReason() throws IOException { + void testFromJsonWithReason() { // Arrange String json = "{" + "\"id\":\"response-3\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_response\"," + "\"approval_request_id\":\"req-789\"," + "\"approve\":false," @@ -73,7 +71,7 @@ void testFromJsonWithReason() throws IOException { } @Test - void testTypeIsAlwaysMcpApprovalResponse() throws IOException { + void testTypeIsAlwaysMcpApprovalResponse() { // Arrange String json = "{" + "\"id\":\"response-4\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_response\"," + "\"approval_request_id\":\"req-999\"," + "\"approve\":true" + "}"; @@ -87,7 +85,7 @@ void testTypeIsAlwaysMcpApprovalResponse() throws IOException { } @Test - void testWithNullReason() throws IOException { + void testWithNullReason() { // Arrange String json = "{" + "\"id\":\"response-5\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_response\"," + "\"approval_request_id\":\"req-111\"," + "\"approve\":true" + "}"; @@ -102,7 +100,7 @@ void testWithNullReason() throws IOException { } @Test - void testJsonRoundTrip() throws IOException { + void testJsonRoundTrip() { // Arrange String originalJson = "{" + "\"id\":\"round-trip\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_response\"," + "\"approval_request_id\":\"req-rt-001\"," + "\"approve\":false," @@ -124,7 +122,7 @@ void testJsonRoundTrip() throws IOException { } @Test - void testApprovalWithDetailedReason() throws IOException { + void testApprovalWithDetailedReason() { // Arrange String detailedReason = "Tool requires elevated privileges. User must confirm the action explicitly."; String json = "{" + "\"id\":\"detailed-response\"," + "\"object\":\"session.item\"," @@ -142,7 +140,7 @@ void testApprovalWithDetailedReason() throws IOException { } @Test - void testApprovalApprovedWithReason() throws IOException { + void testApprovalApprovedWithReason() { // Arrange - approved with reason explaining why String json = "{" + "\"id\":\"approved-with-reason\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_approval_response\"," + "\"approval_request_id\":\"req-approved\"," + "\"approve\":true," diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPCallItemTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPCallItemTest.java index 98cb8d1eb8d7..a089e75bbe84 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPCallItemTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPCallItemTest.java @@ -6,8 +6,6 @@ import com.azure.core.util.BinaryData; import org.junit.jupiter.api.Test; -import java.io.IOException; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -18,7 +16,7 @@ class ResponseMCPCallItemTest { @Test - void testFromJsonWithRequiredFields() throws IOException { + void testFromJsonWithRequiredFields() { // Arrange String json = "{" + "\"id\":\"item-1\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_call\"," + "\"arguments\":\"{\\\"param\\\":\\\"value\\\"}\"," + "\"server_label\":\"test-server\"," @@ -37,7 +35,7 @@ void testFromJsonWithRequiredFields() throws IOException { } @Test - void testFromJsonWithAllFields() throws IOException { + void testFromJsonWithAllFields() { // Arrange String json = "{" + "\"id\":\"item-2\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_call\"," + "\"arguments\":\"{}\"," + "\"server_label\":\"my-server\"," + "\"name\":\"my-tool\"," @@ -59,7 +57,7 @@ void testFromJsonWithAllFields() throws IOException { } @Test - void testTypeIsAlwaysMcpCall() throws IOException { + void testTypeIsAlwaysMcpCall() { // Arrange String json = "{" + "\"id\":\"item-3\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_call\"," + "\"arguments\":\"{}\"," + "\"server_label\":\"server\"," + "\"name\":\"tool\"" + "}"; @@ -72,7 +70,7 @@ void testTypeIsAlwaysMcpCall() throws IOException { } @Test - void testWithNullOptionalFields() throws IOException { + void testWithNullOptionalFields() { // Arrange String json = "{" + "\"id\":\"item-4\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_call\"," + "\"arguments\":\"{\\\"test\\\":true}\"," + "\"server_label\":\"label\"," + "\"name\":\"toolname\"" + "}"; @@ -88,7 +86,7 @@ void testWithNullOptionalFields() throws IOException { } @Test - void testJsonRoundTrip() throws IOException { + void testJsonRoundTrip() { // Arrange String originalJson = "{" + "\"id\":\"test-id\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_call\"," + "\"arguments\":\"{\\\"key\\\":\\\"value\\\"}\"," + "\"server_label\":\"test-server\"," @@ -110,7 +108,7 @@ void testJsonRoundTrip() throws IOException { } @Test - void testComplexArgumentsJson() throws IOException { + void testComplexArgumentsJson() { // Arrange String complexArgs = "{\"nested\":{\"array\":[1,2,3],\"string\":\"value\"},\"number\":42}"; String json = "{" + "\"id\":\"item-5\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_call\"," diff --git a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPListToolItemTest.java b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPListToolItemTest.java index 215b7de42116..8f433cae6786 100644 --- a/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPListToolItemTest.java +++ b/sdk/ai/azure-ai-voicelive/src/test/java/com/azure/ai/voicelive/models/ResponseMCPListToolItemTest.java @@ -6,7 +6,6 @@ import com.azure.core.util.BinaryData; import org.junit.jupiter.api.Test; -import java.io.IOException; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -19,7 +18,7 @@ class ResponseMCPListToolItemTest { @Test - void testFromJsonWithEmptyTools() throws IOException { + void testFromJsonWithEmptyTools() { // Arrange String json = "{" + "\"id\":\"list-1\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_list_tools\"," + "\"tools\":[]," + "\"server_label\":\"test-server\"" + "}"; @@ -37,7 +36,7 @@ void testFromJsonWithEmptyTools() throws IOException { } @Test - void testFromJsonWithMultipleTools() throws IOException { + void testFromJsonWithMultipleTools() { // Arrange String json = "{" + "\"id\":\"list-2\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_list_tools\"," + "\"server_label\":\"production-server\"," + "\"tools\":[" + " {" + " \"name\":\"get_weather\"," @@ -63,7 +62,7 @@ void testFromJsonWithMultipleTools() throws IOException { } @Test - void testTypeIsAlwaysMcpListTools() throws IOException { + void testTypeIsAlwaysMcpListTools() { // Arrange String json = "{" + "\"id\":\"list-3\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_list_tools\"," + "\"tools\":[]," + "\"server_label\":\"test\"" + "}"; @@ -76,7 +75,7 @@ void testTypeIsAlwaysMcpListTools() throws IOException { } @Test - void testJsonRoundTrip() throws IOException { + void testJsonRoundTrip() { // Arrange String originalJson = "{" + "\"id\":\"round-trip-list\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_list_tools\"," + "\"server_label\":\"my-server\"," + "\"tools\":[" + " {" @@ -98,7 +97,7 @@ void testJsonRoundTrip() throws IOException { } @Test - void testToolsWithComplexSchema() throws IOException { + void testToolsWithComplexSchema() { // Arrange String json = "{" + "\"id\":\"complex-tools\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_list_tools\"," + "\"server_label\":\"api-server\"," + "\"tools\":[" + " {" @@ -121,7 +120,7 @@ void testToolsWithComplexSchema() throws IOException { } @Test - void testToolsWithAnnotations() throws IOException { + void testToolsWithAnnotations() { // Arrange String json = "{" + "\"id\":\"annotated-tools\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_list_tools\"," @@ -141,7 +140,7 @@ void testToolsWithAnnotations() throws IOException { } @Test - void testMultipleToolsFromSameServer() throws IOException { + void testMultipleToolsFromSameServer() { // Arrange String json = "{" + "\"id\":\"many-tools\"," + "\"object\":\"session.item\"," + "\"type\":\"mcp_list_tools\"," + "\"server_label\":\"utility-server\"," + "\"tools\":[" From 8a7bdc47d4f4c5993fafbff691e7cb2a6ec589da Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 8 Jan 2026 12:18:44 -0500 Subject: [PATCH 2/5] Remove unnecessary hamcrest dependency, update Jacoco and ASM --- eng/versioning/external_dependencies.txt | 7 +++--- .../azure-resourcemanager-appplatform/pom.xml | 2 +- .../azure-resourcemanager-appservice/pom.xml | 2 +- .../pom.xml | 2 +- sdk/cdn/azure-resourcemanager-cdn/pom.xml | 2 +- sdk/clientcore/core/pom.xml | 2 +- .../pom.xml | 9 +------- .../CallRecordingUnitTestBase.java | 12 +++------- ...unicationIdentifierConverterUnitTests.java | 13 +++++++++-- .../DownloadContentAsyncUnitTests.java | 23 +++++++++---------- .../azure-communication-callingserver/pom.xml | 2 +- .../azure-communication-chat/pom.xml | 2 +- .../azure-communication-jobrouter/pom.xml | 2 +- .../azure-communication-messages/pom.xml | 2 +- .../azure-communication-phonenumbers/pom.xml | 2 +- .../azure-resourcemanager-compute/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-core-http-jdk-httpclient/pom.xml | 2 +- .../azure-resourcemanager-cosmos/pom.xml | 2 +- sdk/dns/azure-resourcemanager-dns/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-messaging-eventgrid/pom.xml | 2 +- .../azure-resourcemanager-eventhubs/pom.xml | 2 +- .../azure-identity-broker-samples/pom.xml | 2 +- .../azure-resourcemanager-keyvault/pom.xml | 2 +- .../azure-security-keyvault-jca/pom.xml | 2 +- .../azure-resourcemanager-monitor/pom.xml | 2 +- sdk/msi/azure-resourcemanager-msi/pom.xml | 2 +- .../azure-resourcemanager-network/pom.xml | 2 +- .../azure-client-sdk-parent-v2/pom.xml | 14 +++++------ sdk/parents/azure-client-sdk-parent/pom.xml | 14 +++++------ sdk/parents/azure-data-sdk-parent/pom.xml | 4 ++-- sdk/parents/clientcore-parent/pom.xml | 14 +++++------ .../azure-resourcemanager-privatedns/pom.xml | 2 +- sdk/redis/azure-resourcemanager-redis/pom.xml | 2 +- .../azure-resourcemanager-test/pom.xml | 2 +- .../azure-resourcemanager/pom.xml | 2 +- .../azure-resourcemanager-appservice/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-resourcemanager-compute/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-resourcemanager-dns/pom.xml | 2 +- .../azure-resourcemanager-eventhubs/pom.xml | 2 +- .../azure-resourcemanager-keyvault/pom.xml | 2 +- .../azure-resourcemanager-monitor/pom.xml | 2 +- .../azure-resourcemanager-network/pom.xml | 2 +- .../azure-resourcemanager-resources/pom.xml | 2 +- .../azure-resourcemanager-storage/pom.xml | 2 +- .../azure-resourcemanager-test/pom.xml | 2 +- .../azure-resourcemanager/pom.xml | 2 +- .../azure-resourcemanager-resources/pom.xml | 2 +- .../azure-resourcemanager-search/pom.xml | 2 +- sdk/serialization/azure-json/pom.xml | 2 +- sdk/serialization/azure-xml/pom.xml | 2 +- .../azure-resourcemanager-servicebus/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- sdk/sql/azure-resourcemanager-sql/pom.xml | 2 +- .../azure-resourcemanager-storage/pom.xml | 2 +- sdk/tools/azure-openrewrite/pom.xml | 2 +- sdk/tools/azure-sdk-archetype/pom.xml | 2 +- sdk/tools/azure-sdk-build-tool/pom.xml | 2 +- .../pom.xml | 2 +- 67 files changed, 110 insertions(+), 116 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 22a9a60ffe89..286e15b6495b 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -140,7 +140,6 @@ org.eclipse.jetty:jetty-alpn-conscrypt-server;9.4.58.v20250814 org.eclipse.jetty:jetty-server;9.4.58.v20250814 org.eclipse.jetty:jetty-servlet;9.4.58.v20250814 org.eclipse.jetty.http2:http2-server;9.4.58.v20250814 -org.hamcrest:hamcrest-all;1.3 org.junit.jupiter:junit-jupiter;5.13.4 org.junit.jupiter:junit-jupiter-api;5.13.4 org.junit.jupiter:junit-jupiter-engine;5.13.4 @@ -197,13 +196,13 @@ org.codehaus.mojo:exec-maven-plugin;3.5.1 org.codehaus.mojo:xml-maven-plugin;1.1.0 org.eclipse.jetty:jetty-maven-plugin;9.4.58.v20250814 org.eclipse.m2e:lifecycle-mapping;1.0.0 -org.jacoco:jacoco-maven-plugin;0.8.13 -org.jacoco:org.jacoco.agent;0.8.13 +org.jacoco:jacoco-maven-plugin;0.8.14 +org.jacoco:org.jacoco.agent;0.8.14 org.mockito:mockito-core;4.11.0 org.mockito:mockito-inline;4.11.0 org.moditect:moditect-maven-plugin;1.0.0.RC1 org.owasp:dependency-check-maven;12.1.1 -org.ow2.asm:asm;9.8 +org.ow2.asm:asm;9.9.1 org.revapi:revapi;0.15.1 org.revapi:revapi-java;0.28.3 org.revapi:revapi-java-spi;0.25.1 diff --git a/sdk/appplatform/azure-resourcemanager-appplatform/pom.xml b/sdk/appplatform/azure-resourcemanager-appplatform/pom.xml index 09c017f38a57..487aa40b1c78 100644 --- a/sdk/appplatform/azure-resourcemanager-appplatform/pom.xml +++ b/sdk/appplatform/azure-resourcemanager-appplatform/pom.xml @@ -188,7 +188,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/appservice/azure-resourcemanager-appservice/pom.xml b/sdk/appservice/azure-resourcemanager-appservice/pom.xml index 0be7ed5bb346..e3825f3f74c3 100644 --- a/sdk/appservice/azure-resourcemanager-appservice/pom.xml +++ b/sdk/appservice/azure-resourcemanager-appservice/pom.xml @@ -136,7 +136,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/authorization/azure-resourcemanager-authorization/pom.xml b/sdk/authorization/azure-resourcemanager-authorization/pom.xml index 2fd9baa7cb44..43583951fbc9 100644 --- a/sdk/authorization/azure-resourcemanager-authorization/pom.xml +++ b/sdk/authorization/azure-resourcemanager-authorization/pom.xml @@ -144,7 +144,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/cdn/azure-resourcemanager-cdn/pom.xml b/sdk/cdn/azure-resourcemanager-cdn/pom.xml index 0666cc3c49a5..db94b78e0854 100644 --- a/sdk/cdn/azure-resourcemanager-cdn/pom.xml +++ b/sdk/cdn/azure-resourcemanager-cdn/pom.xml @@ -141,7 +141,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/clientcore/core/pom.xml b/sdk/clientcore/core/pom.xml index 12469ccbe50d..217d925ebc8b 100644 --- a/sdk/clientcore/core/pom.xml +++ b/sdk/clientcore/core/pom.xml @@ -190,7 +190,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 META-INF/** diff --git a/sdk/communication/azure-communication-callautomation/pom.xml b/sdk/communication/azure-communication-callautomation/pom.xml index 8dd513dce30f..513b72c26135 100644 --- a/sdk/communication/azure-communication-callautomation/pom.xml +++ b/sdk/communication/azure-communication-callautomation/pom.xml @@ -93,13 +93,6 @@ 9.37.3 test - - org.hamcrest - hamcrest-all - 1.3 - - test - com.azure azure-identity @@ -118,7 +111,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/communication/callautomation/*.class diff --git a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallRecordingUnitTestBase.java b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallRecordingUnitTestBase.java index ecaae567aa68..a7b86d3b7afc 100644 --- a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallRecordingUnitTestBase.java +++ b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CallRecordingUnitTestBase.java @@ -3,13 +3,10 @@ package com.azure.communication.callautomation; -import com.azure.communication.callautomation.implementation.models.RecordingStateInternal; import com.azure.communication.callautomation.implementation.models.RecordingKindInternal; +import com.azure.communication.callautomation.implementation.models.RecordingStateInternal; import com.azure.communication.callautomation.implementation.models.RecordingStateResponseInternal; -import com.azure.json.JsonProviders; -import com.azure.json.JsonWriter; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.AbstractMap; import java.util.ArrayList; @@ -41,11 +38,8 @@ public class CallRecordingUnitTestBase { )); private String serializeObject(RecordingStateResponseInternal o) { - try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - JsonWriter writer = JsonProviders.createWriter(outputStream)) { - o.toJson(writer); - writer.flush(); - return outputStream.toString(); + try { + return o.toJsonString(); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CommunicationIdentifierConverterUnitTests.java b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CommunicationIdentifierConverterUnitTests.java index b212d385293c..086cd6f6977d 100644 --- a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CommunicationIdentifierConverterUnitTests.java +++ b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/CommunicationIdentifierConverterUnitTests.java @@ -12,10 +12,19 @@ import com.azure.communication.callautomation.implementation.models.MicrosoftTeamsUserIdentifierModel; import com.azure.communication.callautomation.implementation.models.PhoneNumberIdentifierModel; import com.azure.communication.callautomation.implementation.models.TeamsExtensionUserIdentifierModel; -import com.azure.communication.common.*; +import com.azure.communication.common.CommunicationCloudEnvironment; +import com.azure.communication.common.CommunicationIdentifier; +import com.azure.communication.common.CommunicationUserIdentifier; +import com.azure.communication.common.MicrosoftTeamsAppIdentifier; +import com.azure.communication.common.MicrosoftTeamsUserIdentifier; +import com.azure.communication.common.PhoneNumberIdentifier; +import com.azure.communication.common.TeamsExtensionUserIdentifier; +import com.azure.communication.common.UnknownIdentifier; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; public class CommunicationIdentifierConverterUnitTests extends CallAutomationUnitTestBase { diff --git a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/DownloadContentAsyncUnitTests.java b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/DownloadContentAsyncUnitTests.java index 0eff91788ba4..9cfebbba152e 100644 --- a/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/DownloadContentAsyncUnitTests.java +++ b/sdk/communication/azure-communication-callautomation/src/test/java/com/azure/communication/callautomation/DownloadContentAsyncUnitTests.java @@ -3,6 +3,14 @@ package com.azure.communication.callautomation; +import com.azure.communication.callautomation.models.DownloadToFileOptions; +import com.azure.communication.callautomation.models.ParallelDownloadOptions; +import com.azure.core.http.HttpRange; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -11,22 +19,13 @@ import java.nio.charset.StandardCharsets; import java.nio.file.FileSystems; import java.nio.file.Path; +import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collections; import java.util.UUID; -import java.util.AbstractMap.SimpleEntry; - -import com.azure.communication.callautomation.models.DownloadToFileOptions; -import com.azure.communication.callautomation.models.ParallelDownloadOptions; -import com.azure.core.http.HttpRange; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DownloadContentAsyncUnitTests { diff --git a/sdk/communication/azure-communication-callingserver/pom.xml b/sdk/communication/azure-communication-callingserver/pom.xml index 16d7ab83a68e..0a075ef97314 100644 --- a/sdk/communication/azure-communication-callingserver/pom.xml +++ b/sdk/communication/azure-communication-callingserver/pom.xml @@ -118,7 +118,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/communication/callingserver/*.class diff --git a/sdk/communication/azure-communication-chat/pom.xml b/sdk/communication/azure-communication-chat/pom.xml index f9e9c9967d54..17e14d127919 100644 --- a/sdk/communication/azure-communication-chat/pom.xml +++ b/sdk/communication/azure-communication-chat/pom.xml @@ -89,7 +89,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/communication/chat/*.class diff --git a/sdk/communication/azure-communication-jobrouter/pom.xml b/sdk/communication/azure-communication-jobrouter/pom.xml index f6136fa9121a..7747754d9006 100644 --- a/sdk/communication/azure-communication-jobrouter/pom.xml +++ b/sdk/communication/azure-communication-jobrouter/pom.xml @@ -84,7 +84,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/communication/jobrouter/*.class diff --git a/sdk/communication/azure-communication-messages/pom.xml b/sdk/communication/azure-communication-messages/pom.xml index f2968454627a..11c4b471eb35 100644 --- a/sdk/communication/azure-communication-messages/pom.xml +++ b/sdk/communication/azure-communication-messages/pom.xml @@ -94,7 +94,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/communication/messages/*.class diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml index 1b1d199055b6..df23f68441a8 100644 --- a/sdk/communication/azure-communication-phonenumbers/pom.xml +++ b/sdk/communication/azure-communication-phonenumbers/pom.xml @@ -122,7 +122,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/communication/phonenumbers/*.class diff --git a/sdk/compute/azure-resourcemanager-compute/pom.xml b/sdk/compute/azure-resourcemanager-compute/pom.xml index 5b7045da2805..14fad5c252d1 100644 --- a/sdk/compute/azure-resourcemanager-compute/pom.xml +++ b/sdk/compute/azure-resourcemanager-compute/pom.xml @@ -191,7 +191,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/containerinstance/azure-resourcemanager-containerinstance/pom.xml b/sdk/containerinstance/azure-resourcemanager-containerinstance/pom.xml index 4afb220d5cc0..e66ab748c128 100644 --- a/sdk/containerinstance/azure-resourcemanager-containerinstance/pom.xml +++ b/sdk/containerinstance/azure-resourcemanager-containerinstance/pom.xml @@ -155,7 +155,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/containerregistry/azure-resourcemanager-containerregistry/pom.xml b/sdk/containerregistry/azure-resourcemanager-containerregistry/pom.xml index 221df8a5e2f8..3f4952880be1 100644 --- a/sdk/containerregistry/azure-resourcemanager-containerregistry/pom.xml +++ b/sdk/containerregistry/azure-resourcemanager-containerregistry/pom.xml @@ -118,7 +118,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/containerservice/azure-resourcemanager-containerservice/pom.xml b/sdk/containerservice/azure-resourcemanager-containerservice/pom.xml index 511213e680b0..10fbcfcec6a1 100644 --- a/sdk/containerservice/azure-resourcemanager-containerservice/pom.xml +++ b/sdk/containerservice/azure-resourcemanager-containerservice/pom.xml @@ -119,7 +119,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index 9786e7ba5f90..ca0e68b65413 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -138,7 +138,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 true diff --git a/sdk/cosmos/azure-resourcemanager-cosmos/pom.xml b/sdk/cosmos/azure-resourcemanager-cosmos/pom.xml index 4bfe79dab908..6e5f8ab7723c 100644 --- a/sdk/cosmos/azure-resourcemanager-cosmos/pom.xml +++ b/sdk/cosmos/azure-resourcemanager-cosmos/pom.xml @@ -132,7 +132,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/dns/azure-resourcemanager-dns/pom.xml b/sdk/dns/azure-resourcemanager-dns/pom.xml index b96357fec92b..0b1ebf517403 100644 --- a/sdk/dns/azure-resourcemanager-dns/pom.xml +++ b/sdk/dns/azure-resourcemanager-dns/pom.xml @@ -128,7 +128,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/pom.xml index 2c031d339da5..764a85eee0a3 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid-systemevents/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid-systemevents/pom.xml @@ -80,7 +80,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator. org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/messaging/eventgrid/systemevents/** diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 28b97cad8174..5023f680f577 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -111,7 +111,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/messaging/eventgrid/systemevents/** diff --git a/sdk/eventhubs/azure-resourcemanager-eventhubs/pom.xml b/sdk/eventhubs/azure-resourcemanager-eventhubs/pom.xml index 451da1df5498..7ae2623d7582 100644 --- a/sdk/eventhubs/azure-resourcemanager-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-resourcemanager-eventhubs/pom.xml @@ -128,7 +128,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/identity/azure-identity-broker-samples/pom.xml b/sdk/identity/azure-identity-broker-samples/pom.xml index 53b4748f542f..1ed444656bdf 100644 --- a/sdk/identity/azure-identity-broker-samples/pom.xml +++ b/sdk/identity/azure-identity-broker-samples/pom.xml @@ -108,7 +108,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 true diff --git a/sdk/keyvault/azure-resourcemanager-keyvault/pom.xml b/sdk/keyvault/azure-resourcemanager-keyvault/pom.xml index 51bb75ddc174..f8853da9b5db 100644 --- a/sdk/keyvault/azure-resourcemanager-keyvault/pom.xml +++ b/sdk/keyvault/azure-resourcemanager-keyvault/pom.xml @@ -150,7 +150,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index b955be59cec9..ec20bba282d8 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -269,7 +269,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 default-prepare-agent diff --git a/sdk/monitor/azure-resourcemanager-monitor/pom.xml b/sdk/monitor/azure-resourcemanager-monitor/pom.xml index 9fa3872ea845..9e0f8728c07f 100644 --- a/sdk/monitor/azure-resourcemanager-monitor/pom.xml +++ b/sdk/monitor/azure-resourcemanager-monitor/pom.xml @@ -161,7 +161,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/msi/azure-resourcemanager-msi/pom.xml b/sdk/msi/azure-resourcemanager-msi/pom.xml index 54d328a8fda0..369333dc2116 100644 --- a/sdk/msi/azure-resourcemanager-msi/pom.xml +++ b/sdk/msi/azure-resourcemanager-msi/pom.xml @@ -124,7 +124,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/network/azure-resourcemanager-network/pom.xml b/sdk/network/azure-resourcemanager-network/pom.xml index 87b1d32d0674..13d951015f7b 100644 --- a/sdk/network/azure-resourcemanager-network/pom.xml +++ b/sdk/network/azure-resourcemanager-network/pom.xml @@ -146,7 +146,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/parents/azure-client-sdk-parent-v2/pom.xml b/sdk/parents/azure-client-sdk-parent-v2/pom.xml index d22f62ad1980..a8ee8c08ff77 100644 --- a/sdk/parents/azure-client-sdk-parent-v2/pom.xml +++ b/sdk/parents/azure-client-sdk-parent-v2/pom.xml @@ -262,7 +262,7 @@ org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 test @@ -451,7 +451,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 ${project.build.directory}/jacoco.exec @@ -747,7 +747,7 @@ org.ow2.asm asm - 9.8 + 9.9.1 @@ -862,14 +862,14 @@ org.ow2.asm asm - 9.8 + 9.9.1 org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 @@ -912,14 +912,14 @@ org.ow2.asm asm - 9.8 + 9.9.1 org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml index 5bed451ef535..680523d726fd 100644 --- a/sdk/parents/azure-client-sdk-parent/pom.xml +++ b/sdk/parents/azure-client-sdk-parent/pom.xml @@ -272,7 +272,7 @@ org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 test @@ -461,7 +461,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 ${project.build.directory}/jacoco.exec @@ -759,7 +759,7 @@ org.ow2.asm asm - 9.8 + 9.9.1 @@ -935,14 +935,14 @@ org.ow2.asm asm - 9.8 + 9.9.1 org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 @@ -985,14 +985,14 @@ org.ow2.asm asm - 9.8 + 9.9.1 org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 diff --git a/sdk/parents/azure-data-sdk-parent/pom.xml b/sdk/parents/azure-data-sdk-parent/pom.xml index b0cf3d7c6c89..4288c6d213a7 100644 --- a/sdk/parents/azure-data-sdk-parent/pom.xml +++ b/sdk/parents/azure-data-sdk-parent/pom.xml @@ -126,7 +126,7 @@ org.ow2.asm asm - 9.8 + 9.9.1 @@ -276,7 +276,7 @@ org.ow2.asm asm - 9.8 + 9.9.1 diff --git a/sdk/parents/clientcore-parent/pom.xml b/sdk/parents/clientcore-parent/pom.xml index 0f9663085d94..333fe1c6d6aa 100644 --- a/sdk/parents/clientcore-parent/pom.xml +++ b/sdk/parents/clientcore-parent/pom.xml @@ -238,7 +238,7 @@ org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 test @@ -530,7 +530,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 ${project.build.directory}/jacoco.exec @@ -827,7 +827,7 @@ org.ow2.asm asm - 9.8 + 9.9.1 @@ -926,14 +926,14 @@ org.ow2.asm asm - 9.8 + 9.9.1 org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 @@ -984,14 +984,14 @@ org.ow2.asm asm - 9.8 + 9.9.1 org.jacoco org.jacoco.agent runtime - 0.8.13 + 0.8.14 diff --git a/sdk/privatedns/azure-resourcemanager-privatedns/pom.xml b/sdk/privatedns/azure-resourcemanager-privatedns/pom.xml index 22e968545506..83b59320e694 100644 --- a/sdk/privatedns/azure-resourcemanager-privatedns/pom.xml +++ b/sdk/privatedns/azure-resourcemanager-privatedns/pom.xml @@ -131,7 +131,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/redis/azure-resourcemanager-redis/pom.xml b/sdk/redis/azure-resourcemanager-redis/pom.xml index f9f1617136fd..128b80c0007c 100644 --- a/sdk/redis/azure-resourcemanager-redis/pom.xml +++ b/sdk/redis/azure-resourcemanager-redis/pom.xml @@ -131,7 +131,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml index d41ab593b335..0fc2f075dc0c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-test/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-test/pom.xml @@ -94,7 +94,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml index 3978e068999e..568cabf56f1e 100644 --- a/sdk/resourcemanager/azure-resourcemanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml @@ -318,7 +318,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-appservice/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-appservice/pom.xml index 948326ee2279..e1fce83c5522 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-appservice/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-appservice/pom.xml @@ -154,7 +154,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-authorization/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-authorization/pom.xml index 553edd7bcd92..e300ebf4aade 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-authorization/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-authorization/pom.xml @@ -122,7 +122,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-compute/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-compute/pom.xml index 7d8e5a76ec6d..723828895bba 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-compute/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-compute/pom.xml @@ -182,7 +182,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-containerregistry/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-containerregistry/pom.xml index 255e49c6159e..c0b44e1b85d4 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-containerregistry/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-containerregistry/pom.xml @@ -122,7 +122,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-containerservice/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-containerservice/pom.xml index 07f84bdf6658..af7bb49410ed 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-containerservice/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-containerservice/pom.xml @@ -118,7 +118,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-dns/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-dns/pom.xml index 868b3613d16f..0559745e1457 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-dns/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-dns/pom.xml @@ -127,7 +127,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-eventhubs/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-eventhubs/pom.xml index 6fef386f4b10..ffbe2be259b8 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-eventhubs/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-eventhubs/pom.xml @@ -121,7 +121,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-keyvault/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-keyvault/pom.xml index 40f84083875b..570f1a41324b 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-keyvault/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-keyvault/pom.xml @@ -149,7 +149,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-monitor/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-monitor/pom.xml index 2c39b3a2c0fd..a9de399bdc75 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-monitor/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-monitor/pom.xml @@ -154,7 +154,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-network/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-network/pom.xml index 4d3347a3d01c..c0c08d4d1327 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-network/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-network/pom.xml @@ -146,7 +146,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml index c7ba52c3b47b..1f1b2c070a7e 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml @@ -155,7 +155,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-storage/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-storage/pom.xml index 9e193479f9ba..822a66da89ee 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-storage/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-storage/pom.xml @@ -114,7 +114,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager-test/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager-test/pom.xml index 872781b1a3e2..71006815ab50 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager-test/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager-test/pom.xml @@ -113,7 +113,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resourcemanagerhybrid/azure-resourcemanager/pom.xml b/sdk/resourcemanagerhybrid/azure-resourcemanager/pom.xml index 7d0904591d73..08547fef8bd4 100644 --- a/sdk/resourcemanagerhybrid/azure-resourcemanager/pom.xml +++ b/sdk/resourcemanagerhybrid/azure-resourcemanager/pom.xml @@ -221,7 +221,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/resources/azure-resourcemanager-resources/pom.xml b/sdk/resources/azure-resourcemanager-resources/pom.xml index b36c8b5f5e6b..3d5d639ccba9 100644 --- a/sdk/resources/azure-resourcemanager-resources/pom.xml +++ b/sdk/resources/azure-resourcemanager-resources/pom.xml @@ -144,7 +144,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/search/azure-resourcemanager-search/pom.xml b/sdk/search/azure-resourcemanager-search/pom.xml index af174fc97ec0..7e5d1f6ea820 100644 --- a/sdk/search/azure-resourcemanager-search/pom.xml +++ b/sdk/search/azure-resourcemanager-search/pom.xml @@ -116,7 +116,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/serialization/azure-json/pom.xml b/sdk/serialization/azure-json/pom.xml index 9884a2bcab22..389a9dd48edb 100644 --- a/sdk/serialization/azure-json/pom.xml +++ b/sdk/serialization/azure-json/pom.xml @@ -139,7 +139,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 META-INF/** diff --git a/sdk/serialization/azure-xml/pom.xml b/sdk/serialization/azure-xml/pom.xml index 95bef2be26a0..02858677cd5f 100644 --- a/sdk/serialization/azure-xml/pom.xml +++ b/sdk/serialization/azure-xml/pom.xml @@ -142,7 +142,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 META-INF/** diff --git a/sdk/servicebus/azure-resourcemanager-servicebus/pom.xml b/sdk/servicebus/azure-resourcemanager-servicebus/pom.xml index a1d09bac9100..8caca92d6c7f 100644 --- a/sdk/servicebus/azure-resourcemanager-servicebus/pom.xml +++ b/sdk/servicebus/azure-resourcemanager-servicebus/pom.xml @@ -116,7 +116,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml index d3f7b99ee089..fa1bf4f68796 100644 --- a/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml @@ -75,7 +75,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 true diff --git a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml index 4bec5f21f45f..35825de7ac6c 100644 --- a/sdk/spring/spring-cloud-azure-integration-tests/pom.xml +++ b/sdk/spring/spring-cloud-azure-integration-tests/pom.xml @@ -170,7 +170,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 true diff --git a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml index 960fffcfa2d2..783664694fc8 100644 --- a/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml +++ b/sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml @@ -133,7 +133,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 true diff --git a/sdk/sql/azure-resourcemanager-sql/pom.xml b/sdk/sql/azure-resourcemanager-sql/pom.xml index 2cf41c4182b1..033ced9abfc4 100644 --- a/sdk/sql/azure-resourcemanager-sql/pom.xml +++ b/sdk/sql/azure-resourcemanager-sql/pom.xml @@ -132,7 +132,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/storage/azure-resourcemanager-storage/pom.xml b/sdk/storage/azure-resourcemanager-storage/pom.xml index c23bc4a485cb..0858552e26cc 100644 --- a/sdk/storage/azure-resourcemanager-storage/pom.xml +++ b/sdk/storage/azure-resourcemanager-storage/pom.xml @@ -135,7 +135,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* diff --git a/sdk/tools/azure-openrewrite/pom.xml b/sdk/tools/azure-openrewrite/pom.xml index 34a1823cea66..24742ce12693 100644 --- a/sdk/tools/azure-openrewrite/pom.xml +++ b/sdk/tools/azure-openrewrite/pom.xml @@ -489,7 +489,7 @@ org.ow2.asm asm - 9.8 + 9.9.1 diff --git a/sdk/tools/azure-sdk-archetype/pom.xml b/sdk/tools/azure-sdk-archetype/pom.xml index 4893b466dd81..5360f8cfc1e2 100644 --- a/sdk/tools/azure-sdk-archetype/pom.xml +++ b/sdk/tools/azure-sdk-archetype/pom.xml @@ -205,7 +205,7 @@ org.ow2.asm asm - 9.8 + 9.9.1 diff --git a/sdk/tools/azure-sdk-build-tool/pom.xml b/sdk/tools/azure-sdk-build-tool/pom.xml index 5342c8e14d51..5bf72e89dfd9 100644 --- a/sdk/tools/azure-sdk-build-tool/pom.xml +++ b/sdk/tools/azure-sdk-build-tool/pom.xml @@ -265,7 +265,7 @@ org.ow2.asm asm - 9.8 + 9.9.1 diff --git a/sdk/trafficmanager/azure-resourcemanager-trafficmanager/pom.xml b/sdk/trafficmanager/azure-resourcemanager-trafficmanager/pom.xml index 1720578438e9..d178f55d2b36 100644 --- a/sdk/trafficmanager/azure-resourcemanager-trafficmanager/pom.xml +++ b/sdk/trafficmanager/azure-resourcemanager-trafficmanager/pom.xml @@ -115,7 +115,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 com/azure/resourcemanager/**/fluent/**/* From b7e57e6ebad36099cd9a45f605ef4f2f562535b7 Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 8 Jan 2026 12:52:53 -0500 Subject: [PATCH 3/5] Remove Commons Compress --- eng/versioning/external_dependencies.txt | 1 - .../azure-resourcemanager-appplatform/pom.xml | 20 ----------- .../appplatform/SpringCloudLiveOnlyTest.java | 34 ++++--------------- sdk/clientcore/core/pom.xml | 6 ---- 4 files changed, 7 insertions(+), 54 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 286e15b6495b..8e26939a707d 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -62,7 +62,6 @@ io.projectreactor:reactor-core;3.7.14 io.vertx:vertx-codegen;4.5.23 io.vertx:vertx-core;4.5.23 javax.websocket:javax.websocket-api;1.1 -org.apache.commons:commons-compress;1.26.0 org.apache.ant:ant;1.10.15 org.apache.avro:avro;1.11.4 org.apache.avro:avro-maven-plugin;1.11.4 diff --git a/sdk/appplatform/azure-resourcemanager-appplatform/pom.xml b/sdk/appplatform/azure-resourcemanager-appplatform/pom.xml index 487aa40b1c78..53d09deda1d1 100644 --- a/sdk/appplatform/azure-resourcemanager-appplatform/pom.xml +++ b/sdk/appplatform/azure-resourcemanager-appplatform/pom.xml @@ -82,12 +82,6 @@ - - org.apache.commons - commons-compress - 1.26.0 - test - org.junit.jupiter junit-jupiter-engine @@ -170,20 +164,6 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 3.6.1 - - - - - org.apache.commons:commons-compress:[1.26.0] - - - - - org.jacoco diff --git a/sdk/appplatform/azure-resourcemanager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/SpringCloudLiveOnlyTest.java b/sdk/appplatform/azure-resourcemanager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/SpringCloudLiveOnlyTest.java index 8bc2105182d5..0a8bc24e4522 100644 --- a/sdk/appplatform/azure-resourcemanager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/SpringCloudLiveOnlyTest.java +++ b/sdk/appplatform/azure-resourcemanager-appplatform/src/test/java/com/azure/resourcemanager/appplatform/SpringCloudLiveOnlyTest.java @@ -20,10 +20,6 @@ import com.azure.security.keyvault.certificates.CertificateClient; import com.azure.security.keyvault.certificates.CertificateClientBuilder; import com.azure.security.keyvault.certificates.models.ImportCertificateOptions; -import org.apache.commons.compress.archivers.tar.TarArchiveEntry; -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; -import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -317,7 +313,7 @@ private File downloadFile(String remoteFileUrl) throws Exception { connection.connect(); try (InputStream inputStream = connection.getInputStream(); OutputStream outputStream = new FileOutputStream(downloaded)) { - IOUtils.copy(inputStream, outputStream); + copy(inputStream, outputStream); } finally { connection.disconnect(); } @@ -325,28 +321,12 @@ private File downloadFile(String remoteFileUrl) throws Exception { return downloaded; } - private void extraTarGzSource(File folder, URL url) throws IOException { - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.connect(); - try (TarArchiveInputStream inputStream - = new TarArchiveInputStream(new GzipCompressorInputStream(connection.getInputStream()))) { - TarArchiveEntry entry; - while ((entry = inputStream.getNextTarEntry()) != null) { - if (entry.isDirectory()) { - continue; - } - File file = new File(folder, entry.getName()); - File parent = file.getParentFile(); - if (parent.exists() || parent.mkdirs()) { - try (OutputStream outputStream = new FileOutputStream(file)) { - IOUtils.copy(inputStream, outputStream); - } - } else { - throw new IllegalStateException("Cannot create directory: " + parent.getAbsolutePath()); - } - } - } finally { - connection.disconnect(); + private static void copy(InputStream source, OutputStream destination) throws IOException { + byte[] buffer = new byte[8192]; + int read; + + while ((read = source.read(buffer, 0, buffer.length)) != -1) { + destination.write(buffer, 0, read); } } diff --git a/sdk/clientcore/core/pom.xml b/sdk/clientcore/core/pom.xml index 217d925ebc8b..6943bee14901 100644 --- a/sdk/clientcore/core/pom.xml +++ b/sdk/clientcore/core/pom.xml @@ -79,12 +79,6 @@ - - org.apache.commons - commons-compress - 1.26.0 - test - org.eclipse.jetty jetty-server From 7fc81021dd60ee2500426286d27dca925a4d522a Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 8 Jan 2026 13:38:21 -0500 Subject: [PATCH 4/5] Cleanup POMs --- .../azure-core-http-jdk-httpclient/pom.xml | 75 +++---------------- .../azure-identity-broker-samples/pom.xml | 75 +++---------------- .../azure-security-keyvault-jca/pom.xml | 20 ----- 3 files changed, 22 insertions(+), 148 deletions(-) diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index ca0e68b65413..0ff8f1b68371 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -133,45 +133,19 @@ [,11) + + + true + true + true + true + true + true + true + true + - - org.jacoco - jacoco-maven-plugin - 0.8.14 - - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - true - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.3 - - true - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.3 - - true - - - org.apache.maven.plugins maven-jar-plugin @@ -180,33 +154,6 @@ true - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.6.0 - - true - - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.8.3.1 - - true - - - - - org.revapi - revapi-maven-plugin - 0.15.1 - - true - - diff --git a/sdk/identity/azure-identity-broker-samples/pom.xml b/sdk/identity/azure-identity-broker-samples/pom.xml index 1ed444656bdf..a10f87f1ec9b 100644 --- a/sdk/identity/azure-identity-broker-samples/pom.xml +++ b/sdk/identity/azure-identity-broker-samples/pom.xml @@ -103,45 +103,19 @@ [,11) + + + true + true + true + true + true + true + true + true + - - org.jacoco - jacoco-maven-plugin - 0.8.14 - - true - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - true - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.3 - - true - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.3 - - true - - - org.apache.maven.plugins maven-jar-plugin @@ -150,33 +124,6 @@ true - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.6.0 - - true - - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.8.3.1 - - true - - - - - org.revapi - revapi-maven-plugin - 0.15.1 - - true - - diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index ec20bba282d8..094d0174539a 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -266,26 +266,6 @@ - - org.jacoco - jacoco-maven-plugin - 0.8.14 - - - default-prepare-agent - - prepare-agent - - - - default-report - prepare-package - - report - - - - org.apache.maven.plugins maven-enforcer-plugin From 9901e230be3c5cf4c2f4bf270b7b4899bdabebb9 Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 8 Jan 2026 13:58:20 -0500 Subject: [PATCH 5/5] Fix CHANGELOG --- .../azure-communication-callautomation/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/communication/azure-communication-callautomation/CHANGELOG.md b/sdk/communication/azure-communication-callautomation/CHANGELOG.md index 8086aa5bf334..b04adfbf680e 100644 --- a/sdk/communication/azure-communication-callautomation/CHANGELOG.md +++ b/sdk/communication/azure-communication-callautomation/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.6.0-beta.1 (Unreleased) +## 1.6.0-beta.2 (Unreleased) ### Features Added