From 82995bf75d6a192dda1ace66fff80e02308cc62d Mon Sep 17 00:00:00 2001
From: Weidong Xu <weidxu@microsoft.com>
Date: Tue, 12 Nov 2024 11:01:16 +0800
Subject: [PATCH] http-client-java, remove default flavor=azure (#5045)

So that now the default should be unbranded ("flavor=generic" but we do
not need to write it)

and bump jar versions
---
 packages/http-client-java/emitter/src/emitter.ts |  7 ++-----
 .../generator/http-client-generator-core/pom.xml |  6 +++---
 .../core/model/projectmodel/Project.java         | 12 ++++++------
 .../generator/http-client-generator-mgmt/pom.xml | 12 ++++++------
 .../generator/http-client-generator-test/pom.xml | 16 ++++++++--------
 .../generator/http-client-generator/pom.xml      |  8 ++++----
 6 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/packages/http-client-java/emitter/src/emitter.ts b/packages/http-client-java/emitter/src/emitter.ts
index a31f2acb1b..703dc47f9a 100644
--- a/packages/http-client-java/emitter/src/emitter.ts
+++ b/packages/http-client-java/emitter/src/emitter.ts
@@ -63,7 +63,7 @@ const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
     "output-dir": { type: "string", nullable: true },
     "package-dir": { type: "string", nullable: true },
 
-    flavor: { type: "string", nullable: true, default: "Azure" },
+    flavor: { type: "string", nullable: true },
 
     // service
     "service-name": { type: "string", nullable: true },
@@ -113,10 +113,7 @@ export async function $onEmit(context: EmitContext<EmitterOptions>) {
   if (!options["flavor"]) {
     if (options["package-dir"]?.toLocaleLowerCase().startsWith("azure")) {
       // Azure package
-      options["flavor"] = "Azure";
-    } else {
-      // default
-      options["flavor"] = "Azure";
+      options["flavor"] = "azure";
     }
   }
   const builder = new CodeModelBuilder(program, context);
diff --git a/packages/http-client-java/generator/http-client-generator-core/pom.xml b/packages/http-client-java/generator/http-client-generator-core/pom.xml
index db1dd58ac9..752ec2c69b 100644
--- a/packages/http-client-java/generator/http-client-generator-core/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator-core/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.53.0</version>
+      <version>1.54.0</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
@@ -92,13 +92,13 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java
index dc7b90aa8e..8f474d8b8e 100644
--- a/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java
+++ b/packages/http-client-java/generator/http-client-generator-core/src/main/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java
@@ -56,12 +56,12 @@ public class Project {
     public enum Dependency {
         // azure
         AZURE_CLIENT_SDK_PARENT("com.azure", "azure-client-sdk-parent", "1.7.0"),
-        AZURE_CORE("com.azure", "azure-core", "1.53.0"),
-        AZURE_CORE_MANAGEMENT("com.azure", "azure-core-management", "1.15.4"),
-        AZURE_CORE_HTTP_NETTY("com.azure", "azure-core-http-netty", "1.15.5"),
-        AZURE_CORE_TEST("com.azure", "azure-core-test", "1.27.0-beta.2"),
-        AZURE_IDENTITY("com.azure", "azure-identity", "1.14.0"),
-        AZURE_CORE_EXPERIMENTAL("com.azure", "azure-core-experimental", "1.0.0-beta.54"),
+        AZURE_CORE("com.azure", "azure-core", "1.54.0"),
+        AZURE_CORE_MANAGEMENT("com.azure", "azure-core-management", "1.15.5"),
+        AZURE_CORE_HTTP_NETTY("com.azure", "azure-core-http-netty", "1.15.6"),
+        AZURE_CORE_TEST("com.azure", "azure-core-test", "1.27.0-beta.3"),
+        AZURE_IDENTITY("com.azure", "azure-identity", "1.14.1"),
+        AZURE_CORE_EXPERIMENTAL("com.azure", "azure-core-experimental", "1.0.0-beta.55"),
 
         CLIENTCORE("io.clientcore", "core", "1.0.0-beta.1"),
         CLIENTCORE_JSON("io.clientcore", "core-json", "1.0.0-beta.1");
diff --git a/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml b/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml
index 48ca9d80a8..af1b3ae391 100644
--- a/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator-mgmt/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-management</artifactId>
-      <version>1.15.4</version>
+      <version>1.15.5</version>
       <exclusions>
         <exclusion>
           <groupId>com.fasterxml.jackson.core</groupId>
@@ -49,19 +49,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -75,13 +75,13 @@
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>
-      <version>1.14.12</version>
+      <version>1.15.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy-agent</artifactId>
-      <version>1.14.12</version>
+      <version>1.15.5</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/packages/http-client-java/generator/http-client-generator-test/pom.xml b/packages/http-client-java/generator/http-client-generator-test/pom.xml
index 70dee69e55..d0e5e3876e 100644
--- a/packages/http-client-java/generator/http-client-generator-test/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator-test/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.53.0</version>
+      <version>1.54.0</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
-      <version>1.27.0-beta.2</version>
+      <version>1.27.0-beta.3</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -50,23 +50,23 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.14.0</version>
+      <version>1.14.1</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-management</artifactId>
-      <version>1.15.4</version>
+      <version>1.15.5</version>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.4.38</version>
+      <version>3.4.41</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -79,13 +79,13 @@
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy</artifactId>
-      <version>1.14.12</version>
+      <version>1.15.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>net.bytebuddy</groupId>
       <artifactId>byte-buddy-agent</artifactId>
-      <version>1.14.12</version>
+      <version>1.15.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/packages/http-client-java/generator/http-client-generator/pom.xml b/packages/http-client-java/generator/http-client-generator/pom.xml
index 917f0e1ea7..e8b73693b5 100644
--- a/packages/http-client-java/generator/http-client-generator/pom.xml
+++ b/packages/http-client-java/generator/http-client-generator/pom.xml
@@ -28,19 +28,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.9.3</version>
+      <version>5.11.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.5.2</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <phase>package</phase>