Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version update for external libraries and bumping up versions for next release #5777

Closed
wants to merge 8 commits into from
Closed

Version update for external libraries and bumping up versions for next release #5777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
414815e
Upgrade dependencies to latest version
srnagar Oct 10, 2019
a359734
Merge branch 'master' into version-update
srnagar Oct 10, 2019
db55250
Bump up pom versions for next release
srnagar Oct 11, 2019
bd00fe0
Just to trigger CI pipelines
srnagar Oct 11, 2019
04b44ae
Fix keyvault version in tracing
srnagar Oct 11, 2019
ce738b0
Add KeyVault certificates to JaCoCo
srnagar Oct 11, 2019
e0e204b
Update module name for commons codec
srnagar Oct 11, 2019
1cd38e0
Automatic module name for sdk template module
srnagar Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
<relativePath>../../pom.client.xml</relativePath>
</parent>

Expand All @@ -23,24 +23,24 @@
<url>https://github.com/Azure/azure-sdk-for-java</url>

<properties>
<azure-core.version>1.0.0-preview.6</azure-core.version>
<azure-core-amqp.version>1.0.0-preview.6</azure-core-amqp.version>
<azure-core-http-netty.version>1.0.0-preview.6</azure-core-http-netty.version>
<azure-core-management.version>1.0.0-preview.6</azure-core-management.version>
<azure-core-test.version>1.0.0-preview.6</azure-core-test.version>
<azure-core.version>1.0.0-preview.7</azure-core.version>
<azure-core-amqp.version>1.0.0-preview.7</azure-core-amqp.version>
<azure-core-http-netty.version>1.0.0-preview.7</azure-core-http-netty.version>
<azure-core-management.version>1.0.0-preview.7</azure-core-management.version>
<azure-core-test.version>1.0.0-preview.7</azure-core-test.version>
<azure-data-appconfiguration.version>1.0.0-preview.5</azure-data-appconfiguration.version>
<azure-identity.version>1.0.0-preview.5</azure-identity.version>
<azure-identity.version>1.0.0-preview.6</azure-identity.version>
<azure-keyvault.version>4.0.0-preview.5</azure-keyvault.version>
<azure-messaging-eventhubs.version>5.0.0-preview.4</azure-messaging-eventhubs.version>
<azure-messaging-eventhubs-checkpointstore-blob.version>1.0.0-preview.2</azure-messaging-eventhubs-checkpointstore-blob.version>
<azure-storage-common.version>12.0.0-preview.4</azure-storage-common.version>
<azure-storage-blob.version>12.0.0-preview.4</azure-storage-blob.version>
<azure-storage-blob-batch.version>12.0.0-preview.4</azure-storage-blob-batch.version>
<azure-storage-blob-cryptography.version>12.0.0-preview.4</azure-storage-blob-cryptography.version>
<azure-storage-file.version>12.0.0-preview.4</azure-storage-file.version>
<azure-storage-file-datalake.version>12.0.0-preview.4</azure-storage-file-datalake.version>
<azure-storage-queue.version>12.0.0-preview.4</azure-storage-queue.version>
<azure-storage-queue-cryptography.version>12.0.0-preview.4</azure-storage-queue-cryptography.version>
<azure-messaging-eventhubs.version>5.0.0-preview.5</azure-messaging-eventhubs.version>
<azure-messaging-eventhubs-checkpointstore-blob.version>1.0.0-preview.3</azure-messaging-eventhubs-checkpointstore-blob.version>
<azure-storage-common.version>12.0.0-preview.5</azure-storage-common.version>
<azure-storage-blob.version>12.0.0-preview.5</azure-storage-blob.version>
<azure-storage-blob-batch.version>12.0.0-preview.5</azure-storage-blob-batch.version>
<azure-storage-blob-cryptography.version>12.0.0-preview.5</azure-storage-blob-cryptography.version>
<azure-storage-file.version>12.0.0-preview.5</azure-storage-file.version>
<azure-storage-file-datalake.version>12.0.0-preview.5</azure-storage-file-datalake.version>
<azure-storage-queue.version>12.0.0-preview.5</azure-storage-queue.version>
<azure-storage-queue-cryptography.version>12.0.0-preview.5</azure-storage-queue-cryptography.version>
<project.automatic.module.name>com.azure.eng.jacoco.test.coverage</project.automatic.module.name>
</properties>

Expand Down Expand Up @@ -88,6 +88,11 @@
<artifactId>azure-identity</artifactId>
<version>${azure-identity.version}</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-keyvault-certificates</artifactId>
<version>${azure-keyvault.version}</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-keyvault-keys</artifactId>
Expand Down
26 changes: 13 additions & 13 deletions eng/spotbugs-aggregate-report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>azure-client-sdk-parent</artifactId>
<groupId>com.azure</groupId>
<version>1.5.0</version>
<version>1.6.0</version>
<relativePath>../../pom.client.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -22,20 +22,20 @@
<azure-storage-blob.version>11.0.2</azure-storage-blob.version>

<!-- Track 2 client library versions -->
<azure-core.version>1.0.0-preview.6</azure-core.version>
<azure-core.version>1.0.0-preview.7</azure-core.version>
<azure-data-appconfiguration.version>1.0.0-preview.5</azure-data-appconfiguration.version>
<azure-identity.version>1.0.0-preview.5</azure-identity.version>
<azure-identity.version>1.0.0-preview.6</azure-identity.version>
<azure-keyvault.version>4.0.0-preview.5</azure-keyvault.version>
<azure-messaging-eventhubs.version>5.0.0-preview.4</azure-messaging-eventhubs.version>
<azure-messaging-eventhubs-checkpointstore-blob.version>1.0.0-preview.2</azure-messaging-eventhubs-checkpointstore-blob.version>
<azure-storage-common.version>12.0.0-preview.4</azure-storage-common.version>
<azure-storage-blob.version>12.0.0-preview.4</azure-storage-blob.version>
<azure-storage-blob-batch.version>12.0.0-preview.4</azure-storage-blob-batch.version>
<azure-storage-blob-cryptography.version>12.0.0-preview.4</azure-storage-blob-cryptography.version>
<azure-storage-file.version>12.0.0-preview.4</azure-storage-file.version>
<azure-storage-file-datalake.version>12.0.0-preview.4</azure-storage-file-datalake.version>
<azure-storage-queue.version>12.0.0-preview.4</azure-storage-queue.version>
<azure-storage-queue-cryptography.version>12.0.0-preview.4</azure-storage-queue-cryptography.version>
<azure-messaging-eventhubs.version>5.0.0-preview.5</azure-messaging-eventhubs.version>
<azure-messaging-eventhubs-checkpointstore-blob.version>1.0.0-preview.3</azure-messaging-eventhubs-checkpointstore-blob.version>
<azure-storage-common.version>12.0.0-preview.5</azure-storage-common.version>
<azure-storage-blob.version>12.0.0-preview.5</azure-storage-blob.version>
<azure-storage-blob-batch.version>12.0.0-preview.5</azure-storage-blob-batch.version>
<azure-storage-blob-cryptography.version>12.0.0-preview.5</azure-storage-blob-cryptography.version>
<azure-storage-file.version>12.0.0-preview.5</azure-storage-file.version>
<azure-storage-file-datalake.version>12.0.0-preview.5</azure-storage-file-datalake.version>
<azure-storage-queue.version>12.0.0-preview.5</azure-storage-queue.version>
<azure-storage-queue-cryptography.version>12.0.0-preview.5</azure-storage-queue-cryptography.version>
<project.automatic.module.name>com.azure.eng.spotbugs.reporting</project.automatic.module.name>
</properties>

Expand Down
39 changes: 30 additions & 9 deletions parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-sdk-parent</artifactId>
<packaging>pom</packaging>
<version>1.4.0</version>
<version>1.5.0</version>

<name>Microsoft Azure SDK for Java Parent</name>
<description>Parent POM for Microsoft Azure SDK for Java</description>
Expand Down Expand Up @@ -99,13 +99,13 @@
<issues.url>https://github.com/Azure/azure-sdk-for-java/issues</issues.url>

<!-- Dependency Versions -->
<jackson.version>2.9.9</jackson.version>
<jackson.version>2.10.0</jackson.version>
<jackson-databind.version>2.9.9.3</jackson-databind.version>
<client-runtime.version>1.6.12</client-runtime.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-codec.version>1.13</commons-codec.version>
<spotbugs.version>4.0.0-beta3</spotbugs.version>
<spotbugs.maven.version>3.1.12.2</spotbugs.maven.version>
<proton-j-version>0.31.0</proton-j-version>
<proton-j-version>0.33.2</proton-j-version>
<qpid-proton-j-extensions-version>1.2.1</qpid-proton-j-extensions-version>
<log4j-api.version>2.11.1</log4j-api.version>
<groovy-eclipse-compiler.version>3.4.0-01</groovy-eclipse-compiler.version>
Expand All @@ -115,8 +115,8 @@
<slf4j-log4j12.version>1.7.0</slf4j-log4j12.version>
<reactor-core.version>3.3.0.RELEASE</reactor-core.version>
<reactor-netty.version>0.9.0.RELEASE</reactor-netty.version>
<netty.version>4.1.39.Final</netty.version>
<okhttp.version>4.1.0</okhttp.version>
<netty.version>4.1.42.Final</netty.version>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version of reactor-core we're using is 0.9.0-RELEASE which depends on 4.1.39.Final version of Netty. I'm not sure about any issue with we using a version of netty different than reactor-core depends on.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a minor version upgrade and their release notes mention that 41, 42 are bug-fix releases with performance improvements.

There's at least one bug that was reported by a customer and fixed in 41.Final release . So, I would prefer to upgrade unless we find issues with 42.Final that's not in 39.Final.

https://netty.io/news/2019/09/12/4-1-41-Final.html
https://netty.io/news/2019/09/25/4-1-42-Final.html

<okhttp.version>4.2.2</okhttp.version>
<async-http-client.version>2.5.2</async-http-client.version>
<opencensus.version>0.20.0</opencensus.version>
<rxjava.version>1.2.4</rxjava.version>
Expand All @@ -126,7 +126,7 @@
<commons-net.version>3.3</commons-net.version>
<fluentsdk.version>1.14.0</fluentsdk.version>
<codesnippet4javadoc.version>0.31</codesnippet4javadoc.version>
<oauth2-oidc-sdk.version>6.13</oauth2-oidc-sdk.version>
<oauth2-oidc-sdk.version>6.14</oauth2-oidc-sdk.version>
<metrics.version>4.0.5</metrics.version>
<rxjava2.version>2.2.4</rxjava2.version>
<commons-io.version>2.5</commons-io.version>
Expand All @@ -137,21 +137,21 @@
<jcommander.version>1.58</jcommander.version>
<nanohttpd.version>2.3.1</nanohttpd.version>
<google-jsr305.version>3.0.2</google-jsr305.version>
<jna-platform.version>5.4.0</jna-platform.version>

<!-- Test Dependency Versions -->
<adal4j.version>1.6.4</adal4j.version>
<msal4j.version>0.5.0-preview</msal4j.version>
<bcprov-jdk15on.version>1.60</bcprov-jdk15on.version>
<azure-mgmt-keyvault.version>1.11.1</azure-mgmt-keyvault.version>
<azure-mgmt-resources.version>1.3.0</azure-mgmt-resources.version>
<azure-mgmt-resources-test.version>1.3.1-SNAPSHOT</azure-mgmt-resources-test.version>
<azure-mgmt-graph-rbac.version>1.3.0</azure-mgmt-graph-rbac.version>
<azure-mgmt-storage.version>1.3.0</azure-mgmt-storage.version>
<azure-storage.version>8.0.0</azure-storage.version>
<spock-core.version>1.3-groovy-2.5</spock-core.version>
<cglib-nodep.version>3.2.7</cglib-nodep.version>
<slf4j-test.version>1.2.0</slf4j-test.version>
<reactor-test.version>3.2.3.RELEASE</reactor-test.version>
<reactor-test.version>3.3.0.RELEASE</reactor-test.version>
<wiremock-standalone.version>2.24.1</wiremock-standalone.version>
<jetty-http.version>9.4.11.v20180605</jetty-http.version>
<jetty-server.version>9.4.11.v20180605</jetty-server.version>
Expand Down Expand Up @@ -354,13 +354,34 @@
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>org.nanohttpd</groupId>
<artifactId>nanohttpd</artifactId>
<version>${nanohttpd.version}</version>
</dependency>

<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>${jna-platform.version}</version>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.client.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<packaging>pom</packaging>
<version>1.5.0</version>
<version>1.6.0</version>

<name>Microsoft Azure SDK for Java - Client Libraries</name>
<description>Parent POM for Microsoft Azure SDK for Java</description>
Expand All @@ -20,7 +20,7 @@
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-sdk-parent</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
<relativePath>./parent/pom.xml</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions sdk/appconfiguration/azure-data-appconfiguration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
<relativePath>../../../pom.client.xml</relativePath>
</parent>

Expand Down Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -49,14 +49,14 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ta-appconfiguration/src/main/java/com/azure/data/appconfiguration/AzureConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
class AzureConfiguration {
//TODO: Eventually remove these hardcoded strings with https://github.com/Azure/azure-sdk-for-java/issues/3141
static final String NAME = "application-configuration";
static final String VERSION = "1.0.0-preview.4";
static final String VERSION = "1.0.0-preview.5";
}
6 changes: 3 additions & 3 deletions sdk/core/azure-core-amqp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
<relativePath>../../../pom.client.xml</relativePath>
</parent>

<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
<packaging>jar</packaging>

<name>Microsoft Azure Java Core AMQP Library</name>
Expand Down Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...ore/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/ClientConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
public final class ClientConstants {
public static final String NOT_APPLICABLE = "n/a";
public static final String PRODUCT_NAME = "azsdk-java-eventhubs";
public static final String CURRENT_JAVA_CLIENT_VERSION = "5.0.0-preview.4";
public static final String CURRENT_JAVA_CLIENT_VERSION = "5.0.0-preview.5";
public static final String PLATFORM_INFO = getOSInformation();
public static final String FRAMEWORK_INFO = getFrameworkInfo();

Expand Down
10 changes: 5 additions & 5 deletions sdk/core/azure-core-http-netty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
<relativePath>../../../pom.client.xml</relativePath>
</parent>

<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<packaging>jar</packaging>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>

<name>Microsoft Azure Netty HTTP Client Library</name>
<description>This package contains the Netty HTTP client plugin for azure-core.</description>
Expand Down Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -87,14 +87,14 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
</dependency>

<!-- test dependencies on azure-core, because we want to run tests inherited from this module using Netty -->
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions sdk/core/azure-core-http-okhttp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<parent>
<groupId>com.azure</groupId>
<artifactId>azure-client-sdk-parent</artifactId>
<version>1.5.0</version>
<version>1.6.0</version>
<relativePath>../../../pom.client.xml</relativePath>
</parent>

<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<packaging>jar</packaging>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>

<name>Microsoft Azure OkHttp HTTP Client Library</name>
<description>This package contains the OkHttp HTTP client plugin for azure-core.</description>
Expand Down Expand Up @@ -59,12 +59,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
</dependency>

<dependency>
Expand All @@ -76,7 +76,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.0.0-preview.6</version>
<version>1.0.0-preview.7</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
Loading