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

Refactor Azure Spring projects structure #22977

Closed
wants to merge 6 commits into from
Closed

Refactor Azure Spring projects structure #22977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed6c660
move azure-spring-boot-core to azure-spring-cloud-context, move azure…
saragluna Jul 15, 2021
4974816
separate resource manager module
saragluna Jul 15, 2021
a4df708
update jacoco
saragluna Jul 15, 2021
0818e67
update ci.yaml
saragluna Jul 15, 2021
dee5d6c
fix ci errors
saragluna Jul 15, 2021
ef84f4e
fix ci errors
saragluna Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 10 additions & 19 deletions eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,15 +412,21 @@
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;current} -->
</dependency>


<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-core</artifactId>
<version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-core;current} -->
<artifactId>azure-spring-cloud-context</artifactId>
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-context;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot;current} -->
<artifactId>azure-spring-cloud-autoconfigure</artifactId>
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-autoconfigure;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-resourcemanager</artifactId>
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-resourcemanager;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
Expand Down Expand Up @@ -467,11 +473,6 @@
<artifactId>azure-spring-data-cosmos</artifactId>
<version>3.10.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-context</artifactId>
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-context;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-core</artifactId>
Expand All @@ -497,16 +498,6 @@
<artifactId>azure-spring-integration-storage-queue</artifactId>
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-storage</artifactId>
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-storage;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-autoconfigure</artifactId>
<version>2.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-autoconfigure;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-messaging</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ com.azure.spring:azure-spring-cloud-appconfiguration-config;2.0.0-beta.2;2.0.0-b
com.azure.spring:azure-spring-cloud-feature-management-web;2.0.0;2.1.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management;2.0.0;2.1.0-beta.1
com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.0.0-beta.2;2.0.0-beta.3
com.azure.spring:azure-spring-boot-core;1.0.0-beta.1;1.0.0-beta.1
com.azure.spring:azure-spring-boot-bom;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-boot-starter-active-directory;3.6.0;3.7.0-beta.1
Expand All @@ -152,9 +151,9 @@ com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-boot-starter-storage;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-boot-starter;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-boot;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-cloud-autoconfigure;2.6.0;2.7.0-beta.1
com.azure.spring:azure-spring-cloud-context;2.6.0;2.7.0-beta.1
com.azure.spring:azure-spring-cloud-resourcemanager;2.7.0-beta.1;2.7.0-beta.1
com.azure.spring:azure-spring-cloud-dependencies;2.6.0;2.7.0-beta.1
com.azure.spring:azure-spring-cloud-messaging;2.6.0;2.7.0-beta.1
com.azure.spring:azure-spring-cloud-starter-cache;2.6.0;2.7.0-beta.1
Expand Down
3 changes: 0 additions & 3 deletions sdk/spring/azure-spring-boot-core/CHANGELOG.md
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions sdk/spring/azure-spring-boot-core/README.md
View file
Open in desktop

This file was deleted.

87 changes: 0 additions & 87 deletions sdk/spring/azure-spring-boot-core/pom.xml
View file
Open in desktop

This file was deleted.

17 changes: 2 additions & 15 deletions sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,11 @@
<description>Spring Boot Starter for Azure AD B2C and Spring Security Integration</description>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
</dependency>

<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot;current} -->
<artifactId>azure-spring-boot-starter</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter;current} -->
</dependency>

<!-- Below poms will be replaced to azure-spring-boot-starter pom when no milestone tag. -->
Expand Down Expand Up @@ -106,8 +95,6 @@
<includes>
<include>javax.validation:validation-api:[2.0.1.Final]</include> <!-- {x-include-update;javax.validation:validation-api;external_dependency} -->
<include>org.springframework:spring-web:[5.3.8]</include> <!-- {x-include-update;org.springframework:spring-web;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-validation:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
<include>org.springframework.security:spring-security-config:[5.5.1]</include> <!-- {x-include-update;org.springframework.security:spring-security-config;external_dependency} -->
<include>org.springframework.security:spring-security-core:[5.5.1]</include> <!-- {x-include-update;org.springframework.security:spring-security-core;external_dependency} -->
<include>org.springframework.security:spring-security-oauth2-client:[5.5.1]</include> <!-- {x-include-update;org.springframework.security:spring-security-oauth2-client;external_dependency} -->
Expand Down
20 changes: 5 additions & 15 deletions sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,18 @@
<url>https://github.com/Azure/azure-sdk-for-java</url>

<dependencies>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter;current} -->
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-webflux;external_dependency} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot;current} -->
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
Expand Down Expand Up @@ -96,9 +88,7 @@
<include>com.microsoft.azure:msal4j:[1.10.1]</include> <!-- {x-include-update;com.microsoft.azure:msal4j;external_dependency} -->
<include>com.nimbusds:nimbus-jose-jwt:[9.10]</include> <!-- {x-include-update;com.nimbusds:nimbus-jose-jwt;external_dependency} -->
<include>io.projectreactor.netty:reactor-netty:[1.0.8]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-validation:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-webflux:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-webflux;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework.security:spring-security-config:[5.5.1]</include> <!-- {x-include-update;org.springframework.security:spring-security-config;external_dependency} -->
<include>org.springframework.security:spring-security-core:[5.5.1]</include> <!-- {x-include-update;org.springframework.security:spring-security-core;external_dependency} -->
<include>org.springframework.security:spring-security-web:[5.5.1]</include> <!-- {x-include-update;org.springframework.security:spring-security-web;external_dependency} -->
Expand Down
29 changes: 2 additions & 27 deletions sdk/spring/azure-spring-boot-starter-cosmos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,10 @@
<url>https://github.com/Azure/azure-sdk-for-java</url>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot;current} -->
<artifactId>azure-spring-boot-starter</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -44,21 +34,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.springframework.boot:spring-boot-starter:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-validation:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
<!-- BEGIN: Empty Java Doc & Sources -->
<!-- The following code will generate an empty javadoc with just a README.md. This is necessary
to pass the required checks on Maven. The way this works is by setting the classesDirectory
Expand Down
34 changes: 2 additions & 32 deletions sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,10 @@
<url>https://github.com/Azure/azure-sdk-for-java</url>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>2.5.2</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.3.3</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<artifactId>azure-spring-boot-starter</artifactId>
<version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -48,21 +33,6 @@
</dependencies>
<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.springframework.boot:spring-boot-starter:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
<include>org.springframework.boot:spring-boot-starter-validation:[2.5.2]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-validation;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
</configuration>
</plugin>
<!-- BEGIN: Empty Java Doc & Sources -->
<!-- The following code will generate an empty javadoc with just a README.md. This is necessary
to pass the required checks on Maven. The way this works is by setting the classesDirectory
Expand Down
Loading