Skip to content

Commit

Permalink
http-client-java, remove default flavor=azure (#5045)
Browse files Browse the repository at this point in the history 
So that now the default should be unbranded ("flavor=generic" but we do
not need to write it)

and bump jar versions
  • Loading branch information
@weidongxu-microsoft
weidongxu-microsoft authored Nov 12, 2024
1 parent 0c6df27 commit 82995bf
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 32 deletions.
7 changes: 2 additions & 5 deletions packages/http-client-java/emitter/src/emitter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions packages/http-client-java/generator/http-client-generator-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions ...in/java/com/microsoft/typespec/http/client/generator/core/model/projectmodel/Project.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
12 changes: 6 additions & 6 deletions packages/http-client-java/generator/http-client-generator-mgmt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
16 changes: 8 additions & 8 deletions packages/http-client-java/generator/http-client-generator-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions packages/http-client-java/generator/http-client-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand Down

0 comments on commit 82995bf

Please sign in to comment.