eng, bump core jar (#2954)

Azure · Sep 24, 2024 · 4dcd223 · 4dcd223
1 parent 3caefce
commit 4dcd223
Show file tree

Hide file tree

Showing 26 changed files with 89 additions and 84 deletions.
diff --git a/azure-dataplane-tests/pom.xml b/azure-dataplane-tests/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-json</artifactId>
-            <version>1.2.0</version>
+            <version>1.3.0</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-core-http-netty</artifactId>
-            <version>1.15.3</version>
+            <version>1.15.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/azure-tests/pom.xml b/azure-tests/pom.xml
@@ -26,13 +26,13 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-management</artifactId>
-      <version>1.15.2</version>
+      <version>1.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.15.3</version>
+      <version>1.15.4</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/core b/core
diff --git a/customization-base/pom.xml b/customization-base/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-json</artifactId>
-      <version>1.2.0</version>
+      <version>1.3.0</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

diff --git a/customization-base/src/main/resources/pom.xml b/customization-base/src/main/resources/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-json</artifactId>
-      <version>1.2.0</version>
+      <version>1.3.0</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -40,19 +40,19 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.51.0</version>
+      <version>1.52.0</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.15.3</version>
+      <version>1.15.4</version>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.26.2</version>
+      <version>1.27.0-beta.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/customization-tests/pom.xml b/customization-tests/pom.xml
@@ -38,14 +38,14 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.15.3</version>
+      <version>1.15.4</version>
     </dependency>
 
     <!-- Test Dependencies -->
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.26.2</version>
+      <version>1.27.0-beta.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/eng/versioning/sync_versions.py b/eng/versioning/sync_versions.py
@@ -86,6 +86,12 @@ def update_pom(package_versions: List[PackageVersion]):
         if path.isdir(path.join(root_path, folder)) and path.isfile(path.join(root_path, folder, 'pom.xml')):
             pom_files.append(path.join(folder, 'pom.xml'))
 
+    core_relative_path = 'core/packages/http-client-java/generator'
+    core_path = path.join(root_path, core_relative_path)
+    for folder in os.listdir(core_path):
+        if path.isdir(path.join(core_path, folder)) and path.isfile(path.join(core_path, folder, 'pom.xml')):
+            pom_files.append(path.join(core_relative_path, folder, 'pom.xml'))
+
     # POMs
     for pom_file in pom_files:
         with open(path.join(root_path, pom_file), encoding='utf-8') as f_in:

diff --git a/extension-base/pom.xml b/extension-base/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-json</artifactId>
-      <version>1.2.0</version>
+      <version>1.3.0</version>
     </dependency>
     <dependency>
       <groupId>org.yaml</groupId>

diff --git a/fluent-tests/pom.xml b/fluent-tests/pom.xml
@@ -91,25 +91,25 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-management</artifactId>
-      <version>1.15.2</version>
+      <version>1.15.3</version>
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.26.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-core-http-netty</artifactId>
-      <version>1.15.3</version>
+      <version>1.27.0-beta.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.azure</groupId>
+          <artifactId>azure-core-http-jdk-httpclient</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.13.2</version>
+      <version>1.13.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
       <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-core</artifactId>
-        <version>1.51.0</version>
+        <version>1.52.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -151,7 +151,7 @@
             <dependency>
               <groupId>org.ow2.asm</groupId>
               <artifactId>asm</artifactId>
-              <version>9.3</version> <!-- {x-version-update;org.ow2.asm:asm;external_dependency} -->
+              <version>9.3</version>
             </dependency>
           </dependencies>
         </plugin>

diff --git a/protocol-sdk-integration-tests/eng/versioning/version_client.txt b/protocol-sdk-integration-tests/eng/versioning/version_client.txt
@@ -1,8 +1,8 @@
-com.azure:azure-core;1.51.0;1.51.0
-com.azure:azure-core-experimental;1.0.0-beta.52;1.0.0-beta.52
-com.azure:azure-core-http-netty;1.15.3;1.15.3
-com.azure:azure-core-management;1.15.2;1.15.2
-com.azure:azure-core-test;1.26.2;1.26.2
+com.azure:azure-core;1.52.0;1.52.0
+com.azure:azure-core-experimental;1.0.0-beta.53;1.0.0-beta.53
+com.azure:azure-core-http-netty;1.15.4;1.15.4
+com.azure:azure-core-management;1.15.3;1.15.3
+com.azure:azure-core-test;1.27.0-beta.1;1.27.0-beta.1
 
-com.azure:azure-identity;1.13.2;1.13.2
-com.azure:azure-json;1.2.0;1.2.0
+com.azure:azure-identity;1.13.3;1.13.3
+com.azure:azure-json;1.3.0;1.3.0
diff --git a/protocol-tests/pom.xml b/protocol-tests/pom.xml
@@ -26,14 +26,14 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.26.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-core-http-netty</artifactId>
-      <version>1.15.3</version>
+      <version>1.27.0-beta.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.azure</groupId>
+          <artifactId>azure-core-http-jdk-httpclient</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/typespec-tests/customization/pom.xml b/typespec-tests/customization/pom.xml
@@ -16,7 +16,7 @@
     <dependency>
       <groupId>com.azure.tools</groupId>
       <artifactId>azure-autorest-customization</artifactId>
-      <version>1.0.0-beta.8</version> <!-- {x-version-update;com.azure.tools:azure-autorest-customization;external_dependency} -->
+      <version>1.0.0-beta.8</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/typespec-tests/pom.xml b/typespec-tests/pom.xml
@@ -22,18 +22,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.13.2</version>
+      <version>1.13.3</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-management</artifactId>
-      <version>1.15.2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-core-http-netty</artifactId>
       <version>1.15.3</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -57,13 +51,13 @@
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>
-      <version>1.14.12</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy;external_dependency} -->
+      <version>1.14.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy-agent</artifactId>
-      <version>1.14.12</version> <!-- {x-version-update;testdep_net.bytebuddy:byte-buddy-agent;external_dependency} -->
+      <version>1.14.12</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -75,8 +69,14 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.26.2</version>
+      <version>1.27.0-beta.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.azure</groupId>
+          <artifactId>azure-core-http-jdk-httpclient</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 

diff --git a/...resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentityType.java b/...resourcemanager/models/commontypes/managedidentity/models/ManagedServiceIdentityType.java
@@ -12,24 +12,24 @@
  */
 public final class ManagedServiceIdentityType extends ExpandableStringEnum<ManagedServiceIdentityType> {
     /**
-     * Static value None for ManagedServiceIdentityType.
+     * No managed identity.
      */
     public static final ManagedServiceIdentityType NONE = fromString("None");
 
     /**
-     * Static value SystemAssigned for ManagedServiceIdentityType.
+     * System assigned managed identity.
      */
     public static final ManagedServiceIdentityType SYSTEM_ASSIGNED = fromString("SystemAssigned");
 
     /**
-     * Static value UserAssigned for ManagedServiceIdentityType.
+     * User assigned managed identity.
      */
     public static final ManagedServiceIdentityType USER_ASSIGNED = fromString("UserAssigned");
 
     /**
-     * Static value SystemAssigned,UserAssigned for ManagedServiceIdentityType.
+     * System and user assigned managed identity.
      */
-    public static final ManagedServiceIdentityType SYSTEM_ASSIGNED_USER_ASSIGNED
+    public static final ManagedServiceIdentityType SYSTEM_AND_USER_ASSIGNED_V3
         = fromString("SystemAssigned,UserAssigned");
 
     /**

diff --git a/...ts/src/main/java/com/azure/resourcemanager/models/resources/models/ProvisioningState.java b/...ts/src/main/java/com/azure/resourcemanager/models/resources/models/ProvisioningState.java
@@ -12,17 +12,17 @@
  */
 public final class ProvisioningState extends ExpandableStringEnum<ProvisioningState> {
     /**
-     * Static value Succeeded for ProvisioningState.
+     * Resource has been created.
      */
     public static final ProvisioningState SUCCEEDED = fromString("Succeeded");
 
     /**
-     * Static value Failed for ProvisioningState.
+     * Resource creation failed.
      */
     public static final ProvisioningState FAILED = fromString("Failed");
 
     /**
-     * Static value Canceled for ProvisioningState.
+     * Resource creation was canceled.
      */
     public static final ProvisioningState CANCELED = fromString("Canceled");
 

diff --git a/typespec-tests/src/main/java/com/cadl/armresourceprovider/models/ActionType.java b/typespec-tests/src/main/java/com/cadl/armresourceprovider/models/ActionType.java
@@ -13,7 +13,7 @@
  */
 public final class ActionType extends ExpandableStringEnum<ActionType> {
     /**
-     * Static value Internal for ActionType.
+     * Actions are for internal-only APIs.
      */
     public static final ActionType INTERNAL = fromString("Internal");
 

diff --git a/typespec-tests/src/main/java/com/cadl/armresourceprovider/models/Dog.java b/typespec-tests/src/main/java/com/cadl/armresourceprovider/models/Dog.java
@@ -16,7 +16,7 @@
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind", defaultImpl = Dog.class, visible = true)
 @JsonTypeName("Dog")
-@JsonSubTypes({ @JsonSubTypes.Type(name = "golden", value = Golden.class) })
+@JsonSubTypes({ @JsonSubTypes.Type(name = "golden_dog", value = Golden.class) })
 @Fluent
 public class Dog {
     /*

diff --git a/typespec-tests/src/main/java/com/cadl/armresourceprovider/models/DogKind.java b/typespec-tests/src/main/java/com/cadl/armresourceprovider/models/DogKind.java
@@ -13,9 +13,9 @@
  */
 public final class DogKind extends ExpandableStringEnum<DogKind> {
     /**
-     * Static value golden for DogKind.
+     * Species golden.
      */
-    public static final DogKind GOLDEN = fromString("golden");
+    public static final DogKind GOLDEN = fromString("golden_dog");
 
     /**
      * Creates a new instance of DogKind value.

diff --git a/typespec-tests/src/main/java/com/cadl/armresourceprovider/models/Golden.java b/typespec-tests/src/main/java/com/cadl/armresourceprovider/models/Golden.java
@@ -14,7 +14,7 @@
  * Golden dog model.
  */
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "kind", defaultImpl = Golden.class, visible = true)
-@JsonTypeName("golden")
+@JsonTypeName("golden_dog")
 @Fluent
 public final class Golden extends Dog {
     /*

diff --git a/...c-tests/src/main/java/com/cadl/armresourceprovider/models/ManagedServiceIdentityType.java b/...c-tests/src/main/java/com/cadl/armresourceprovider/models/ManagedServiceIdentityType.java
@@ -13,24 +13,24 @@
  */
 public final class ManagedServiceIdentityType extends ExpandableStringEnum<ManagedServiceIdentityType> {
     /**
-     * Static value None for ManagedServiceIdentityType.
+     * No managed identity.
      */
     public static final ManagedServiceIdentityType NONE = fromString("None");
 
     /**
-     * Static value SystemAssigned for ManagedServiceIdentityType.
+     * System assigned managed identity.
      */
     public static final ManagedServiceIdentityType SYSTEM_ASSIGNED = fromString("SystemAssigned");
 
     /**
-     * Static value UserAssigned for ManagedServiceIdentityType.
+     * User assigned managed identity.
      */
     public static final ManagedServiceIdentityType USER_ASSIGNED = fromString("UserAssigned");
 
     /**
-     * Static value SystemAssigned,UserAssigned for ManagedServiceIdentityType.
+     * System and user assigned managed identity.
      */
-    public static final ManagedServiceIdentityType SYSTEM_ASSIGNED_USER_ASSIGNED
+    public static final ManagedServiceIdentityType SYSTEM_AND_USER_ASSIGNED_V3
         = fromString("SystemAssigned,UserAssigned");
 
     /**