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

Fix issues in bom and pom files #27850

Merged
merged 3 commits into from
Mar 24, 2022
Merged

Fix issues in bom and pom files #27850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d3c13e
use azure-sdk-bom
saragluna Mar 24, 2022
9eeb4f8
use latest version of cosmos sdk, fix issues in spring poms
saragluna Mar 24, 2022
f1386a8
add back netty versions in jms
saragluna Mar 24, 2022
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
80 changes: 9 additions & 71 deletions sdk/boms/spring-cloud-azure-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,89 +50,27 @@
<!-- Azure SDK -->
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core</artifactId>
<version>1.26.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<artifactId>azure-cosmos</artifactId> <!-- Spring Cloud Azure is tested with 4.28.0 -->
<version>4.28.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
Comment on lines -53 to 54
Copy link
Member Author

Choose a reason for hiding this comment

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

@pallavit please take a look at this, cosmos releases two versions this month, CHANGELOG.md#4280-2022-03-18, but the azure-sdk-bom contains the first version, but the version used in our code is 4.28.0. So here instead of using the version from the SDK bom, I chose the 4.28.0 in our bom.

</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-management</artifactId>
<version>1.5.3</version> <!-- {x-version-update;com.azure:azure-core-management;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-amqp</artifactId>
<version>2.4.1</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-data-appconfiguration</artifactId>
<version>1.3.1</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.4.6</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.11.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.12.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-servicebus</artifactId>
<version>7.7.0</version> <!-- {x-version-update;com.azure:azure-messaging-servicebus;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-certificates</artifactId>
<version>4.2.8</version> <!-- {x-version-update;com.azure:azure-security-keyvault-certificates;dependency} -->
<artifactId>azure-sdk-bom</artifactId>
<version>1.2.0</version>
saragluna marked this conversation as resolved.
Show resolved Hide resolved
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.3.8</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.13.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-spring-data-cosmos</artifactId>
<version>3.19.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-blob</artifactId>
<version>12.15.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-file-share</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-storage-queue</artifactId>
<version>12.12.0</version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-core-serializer-json-jackson</artifactId>
<version>1.2.14</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-jackson;dependency} -->
</dependency>
<dependency>
<groupId>com.azure.resourcemanager</groupId>
<artifactId>azure-resourcemanager</artifactId>
<version>2.13.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
</dependency>

<!-- Spring Cloud Azure -->
<dependency>
Expand Down
7 changes: 0 additions & 7 deletions sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,6 @@
<artifactId>spring-data-redis</artifactId>
<version>2.6.1</version> <!-- {x-version-update;org.springframework.data:spring-data-redis;external_dependency} -->
<optional>true</optional>
</dependency>
<!-- MongoDB -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
<version>3.3.1</version> <!-- {x-version-update;org.springframework.data:spring-data-mongodb;external_dependency} -->
<optional>true</optional>
</dependency>
<!-- Cosmos -->
<dependency>
Expand Down
1 change: 1 addition & 0 deletions sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
<artifactId>pooled-jms</artifactId>
<version>1.2.3</version> <!-- {x-version-update;org.messaginghub:pooled-jms;external_dependency} -->
</dependency>
<!-- We should keep these netty dependencies, for the netty version in qpid-jms-client is lower than the ones in azure sdks. -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
Expand Down
16 changes: 0 additions & 16 deletions sdk/spring/spring-integration-azure-storage-queue/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,22 +84,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>org.mockito:mockito-core:[4.0.0]</include> <!-- {x-include-update;org.mockito:mockito-core;external_dependency} -->
<include>org.powermock:powermock-api-mockito2:[2.0.9]</include> <!-- {x-include-update;org.powermock:powermock-api-mockito2;external_dependency} -->
<include>org.powermock:powermock-module-junit4:[2.0.9]</include> <!-- {x-include-update;org.powermock:powermock-module-junit4;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions sdk/spring/spring-messaging-azure-eventhubs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,6 @@
<rules>
<bannedDependencies>
<includes>
<include>org.junit.vintage:junit-vintage-engine:[5.8.2]</include> <!-- {x-include-update;org.junit.vintage:junit-vintage-engine;external_dependency} -->
<include>org.mockito:mockito-core:[4.0.0]</include> <!-- {x-include-update;org.mockito:mockito-core;external_dependency} -->
<include>org.powermock:powermock-api-mockito2:[2.0.9]</include> <!-- {x-include-update;org.powermock:powermock-api-mockito2;external_dependency} -->
<include>org.powermock:powermock-module-junit4:[2.0.9]</include> <!-- {x-include-update;org.powermock:powermock-module-junit4;external_dependency} -->
<include>org.springframework:spring-messaging:[5.3.15]</include> <!-- {x-include-update;org.springframework:spring-messaging;external_dependency} -->
<include>org.springframework:spring-tx:[5.3.15]</include> <!-- {x-include-update;org.springframework:spring-tx;external_dependency} -->
<include>org.springframework.retry:spring-retry:[1.3.1]</include> <!-- {x-include-update;org.springframework.retry:spring-retry;external_dependency} -->
Expand Down
4 changes: 0 additions & 4 deletions sdk/spring/spring-messaging-azure-servicebus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,6 @@
<rules>
<bannedDependencies>
<includes>
<include>org.junit.vintage:junit-vintage-engine:[5.8.2]</include> <!-- {x-include-update;org.junit.vintage:junit-vintage-engine;external_dependency} -->
<include>org.mockito:mockito-core:[4.0.0]</include> <!-- {x-include-update;org.mockito:mockito-core;external_dependency} -->
<include>org.powermock:powermock-api-mockito2:[2.0.9]</include> <!-- {x-include-update;org.powermock:powermock-api-mockito2;external_dependency} -->
<include>org.powermock:powermock-module-junit4:[2.0.9]</include> <!-- {x-include-update;org.powermock:powermock-module-junit4;external_dependency} -->
<include>org.springframework:spring-messaging:[5.3.15]</include> <!-- {x-include-update;org.springframework:spring-messaging;external_dependency} -->
<include>org.springframework:spring-tx:[5.3.15]</include> <!-- {x-include-update;org.springframework:spring-tx;external_dependency} -->
<include>org.springframework.retry:spring-retry:[1.3.1]</include> <!-- {x-include-update;org.springframework.retry:spring-retry;external_dependency} -->
Expand Down
16 changes: 0 additions & 16 deletions sdk/spring/spring-messaging-azure-storage-queue/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,22 +103,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.1]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>org.powermock:powermock-api-mockito2:[2.0.9]</include> <!-- {x-include-update;org.powermock:powermock-api-mockito2;external_dependency} -->
<include>org.powermock:powermock-module-junit4:[2.0.9]</include> <!-- {x-include-update;org.powermock:powermock-module-junit4;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down