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 up after azure core release. #7163

Merged
merged 5 commits into from
Jan 7, 2020
Merged

Version up after azure core release. #7163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07f6b6e
Version up after azure core release. Validate via pom_file_version_sc…
Jan 6, 2020
3e28b00
reming version up in README, since they are not released yet.
Jan 7, 2020
458f905
up core test ver
Jan 7, 2020
e477300
review comments
Jan 7, 2020
0738658
Merge branch 'master' of github.com:Azure/azure-sdk-for-java into jan…
Jan 7, 2020
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
10 changes: 5 additions & 5 deletions eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -54,12 +54,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.azure</groupId>-->
Expand All @@ -70,12 +70,12 @@
<!-- <dependency> -->
<!-- <groupId>com.azure</groupId> -->
<!-- <artifactId>azure-core-test</artifactId> -->
<!-- <version>1.1.0</version> --> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<!-- <version>1.2.0-beta.1</version> --> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<!-- </dependency> -->
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opencensus</artifactId>
<version>1.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
<version>1.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
10 changes: 5 additions & 5 deletions eng/spotbugs-aggregate-report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -170,12 +170,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
</dependency>
<!-- <dependency>
<groupId>com.azure</groupId>
Expand All @@ -185,12 +185,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opencensus</artifactId>
<version>1.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
<version>1.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
14 changes: 6 additions & 8 deletions eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ com.azure:azure-sdk-all;1.0.0;1.0.0
com.azure:azure-sdk-parent;1.6.0;1.6.0
com.azure:azure-client-sdk-parent;1.7.0;1.7.0
com.azure:azure-ai-textanalytics;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-core;1.1.0;1.2.0
com.azure:azure-core;1.2.0;1.3.0-beta.1
com.azure:azure-core-amqp;1.0.0-beta.8;1.0.1
com.azure:azure-core-http-netty;1.1.0;1.2.0
com.azure:azure-core-http-okhttp;1.0.0;1.1.0
com.azure:azure-core-http-netty;1.2.0;1.3.0-beta.1
com.azure:azure-core-http-okhttp;1.1.0;1.2.0-beta.1
com.azure:azure-core-management;1.0.0-beta.8;1.0.0-beta.8
com.azure:azure-core-test;1.1.0-beta.2;1.1.0
com.azure:azure-core-tracing-opencensus;1.0.0-beta.5;1.0.0-beta.6
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-core-test;1.1.0;1.2.0-beta.1
com.azure:azure-core-tracing-opencensus;1.0.0-beta.6;1.0.0-beta.7
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-data-appconfiguration;1.0.0-beta.7;1.0.1
com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-identity;1.0.1;1.1.0-beta.1
Expand All @@ -35,6 +35,4 @@ com.azure:azure-storage-queue;12.2.0-beta.1;12.2.0-beta.2
# version. Unreleased dependencies are only valid for dependency versions
# Format;
# unreleased_<groupId>:<artifactId>;dependency-version
unreleased_com.azure:azure-core;1.2.0
unreleased_com.azure:azure-core-amqp;1.0.1
unreleased_com.azure:azure-core-test;1.1.0-beta.2
6 changes: 3 additions & 3 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 @@ -36,7 +36,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -46,14 +46,14 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0-beta.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core-amqp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand Down
8 changes: 4 additions & 4 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 @@ -15,7 +15,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<packaging>jar</packaging>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->

<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 @@ -58,7 +58,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<dependency>
Expand Down Expand Up @@ -109,14 +109,14 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 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 @@ -15,7 +15,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-core-http-okhttp</artifactId>
<packaging>jar</packaging>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;current} -->

<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,7 +59,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<dependency>
Expand All @@ -72,14 +72,14 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions sdk/core/azure-core-management/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<dependency>
Expand All @@ -76,13 +76,13 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<packaging>jar</packaging>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->

<name>Microsoft Azure Java Core Test Library</name>
<description>This package contains core test types for Azure Java clients.</description>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-tracing-opencensus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opencensus</artifactId>
<version>1.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->
<version>1.0.0-beta.7</version> <!-- {x-version-update;com.azure:azure-core-tracing-opencensus;current} -->

<name>Microsoft Azure OpenCensus tracing plugin</name>
<description>This package contains the OpenCensus tracing plugin for Azure client libraries.</description>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/azure-core-tracing-opentelemetry/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-core-tracing-opentelemetry</artifactId>
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;current} -->
<version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;current} -->

<name>Microsoft Azure OpenTelemetry tracing plugin</name>
<description>This package contains the OpenTelemetry tracing plugin for Azure client libraries.</description>
Expand Down Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>

<!--test dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<packaging>jar</packaging>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->

<name>Microsoft Azure Java Core Library</name>
<description>This package contains core types for Azure Java clients.</description>
Expand Down
6 changes: 3 additions & 3 deletions sdk/e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
<version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-http-netty;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -59,7 +59,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-test;current} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions sdk/eventhubs/azure-messaging-eventhubs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.2.0</version> <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -55,7 +55,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0-beta.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/azure-identity/pom.xml
View file
Open in desktop
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.1.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
6 changes: 3 additions & 3 deletions sdk/keyvault/azure-security-keyvault-certificates/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<!-- Test dependencies -->
Expand Down Expand Up @@ -84,7 +84,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0-beta.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions sdk/keyvault/azure-security-keyvault-keys/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-http-netty</artifactId>
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
</dependency>

<!-- Test dependencies -->
Expand Down Expand Up @@ -82,7 +82,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-test</artifactId>
<version>1.1.0-beta.2</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<version>1.1.0</version> <!-- {x-version-update;com.azure:azure-core-test;dependency} -->
<scope>test</scope>
</dependency>

Expand Down
Loading