diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml index f59dbdca705343a3421cc4b6fc636acdbc09354a..0d67ba14e6aff07876584beae9145c84e9f56156 100644 --- a/provider/partition-azure/pom.xml +++ b/provider/partition-azure/pom.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> - <artifactId>partition</artifactId> - <groupId>org.opengroup.osdu</groupId> - <version>1.0.0</version> - <relativePath>../../</relativePath> - </parent> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>partition</artifactId> + <groupId>org.opengroup.osdu</groupId> + <version>1.0.0</version> + <relativePath>../../</relativePath> + </parent> <modelVersion>4.0.0</modelVersion> <artifactId>partition-azure</artifactId> @@ -15,207 +14,208 @@ <description>Partition service on Azure</description> <packaging>jar</packaging> - <properties> - <azure.version>2.3.1</azure.version> - </properties> - <dependencies> - <dependency> - <groupId>com.microsoft.azure</groupId> - <artifactId>azure-active-directory-spring-boot-starter</artifactId> - <version>${azure.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-oauth2-client</artifactId> - </dependency> - <dependency> - <groupId>com.azure</groupId> - <artifactId>azure-security-keyvault-secrets</artifactId> - <version>4.2.0</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-oauth2-jose</artifactId> - </dependency> - <dependency> - <groupId>com.auth0</groupId> - <artifactId>jwks-rsa</artifactId> - <version>0.12.0</version> - </dependency> - <dependency> - <groupId>com.azure</groupId> - <artifactId>azure-core-http-netty</artifactId> - <version>1.5.4</version> - </dependency> - <dependency> - <groupId>org.opengroup.osdu</groupId> - <artifactId>core-lib-azure</artifactId> - <version>0.0.29</version> - <exclusions> - <exclusion> - <groupId>org.opengroup.osdu</groupId> - <artifactId>os-core-common</artifactId> - </exclusion> - <exclusion> - <groupId>com.microsoft.azure</groupId> - <artifactId>applicationinsights-spring-boot-starter</artifactId> - </exclusion> - <exclusion> - <groupId>com.microsoft.azure</groupId> - <artifactId>azure-spring-boot-metrics-starter</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-log4j2</artifactId> - </exclusion> - <exclusion> - <groupId>com.microsoft.azure</groupId> - <artifactId>applicationinsights-logging-log4j2</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.opengroup.osdu</groupId> - <artifactId>os-core-common</artifactId> - <version>${os-core-common.version}</version> - <exclusions> - <exclusion> - <groupId>org.elasticsearch.client</groupId> - <artifactId>elasticsearch-rest-client</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.opengroup.osdu</groupId> - <artifactId>partition-core</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - </dependency> - <!-- + <properties> + <azure.version>2.3.1</azure.version> + </properties> + <dependencies> + <dependency> + <groupId>com.microsoft.azure</groupId> + <artifactId>azure-active-directory-spring-boot-starter</artifactId> + <version>${azure.version}</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-security</artifactId> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-oauth2-client</artifactId> + </dependency> + <dependency> + <groupId>com.azure</groupId> + <artifactId>azure-security-keyvault-secrets</artifactId> + <version>4.2.0</version> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-oauth2-jose</artifactId> + </dependency> + <dependency> + <groupId>com.auth0</groupId> + <artifactId>jwks-rsa</artifactId> + <version>0.12.0</version> + </dependency> + <dependency> + <groupId>com.azure</groupId> + <artifactId>azure-core-http-netty</artifactId> + <version>1.5.4</version> + </dependency> + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>core-lib-azure</artifactId> + <version>0.0.29</version> + <exclusions> + <exclusion> + <groupId>org.opengroup.osdu</groupId> + <artifactId>os-core-common</artifactId> + </exclusion> + <exclusion> + <groupId>com.microsoft.azure</groupId> + <artifactId>applicationinsights-spring-boot-starter</artifactId> + </exclusion> + <exclusion> + <groupId>com.microsoft.azure</groupId> + <artifactId>azure-spring-boot-metrics-starter</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-log4j2</artifactId> + </exclusion> + <exclusion> + <groupId>com.microsoft.azure</groupId> + <artifactId>applicationinsights-logging-log4j2</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>os-core-common</artifactId> + <version>${os-core-common.version}</version> + <exclusions> + <exclusion> + <groupId>org.elasticsearch.client</groupId> + <artifactId>elasticsearch-rest-client</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>partition-core</artifactId> + <version>1.0.0</version> + </dependency> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + </dependency> + <!-- Override the spring-boot version of these dependencies to the ones required by the azure-core library. This needs to be done for each app that depends on this library --> - <dependency> - <groupId>io.projectreactor.netty</groupId> - <artifactId>reactor-netty</artifactId> - <version>0.9.10.RELEASE</version> - </dependency> - <dependency> - <groupId>io.projectreactor</groupId> - <artifactId>reactor-core</artifactId> - <version>3.3.8.RELEASE</version> - </dependency> + <dependency> + <groupId>io.projectreactor.netty</groupId> + <artifactId>reactor-netty</artifactId> + <version>0.9.10.RELEASE</version> + </dependency> + <dependency> + <groupId>io.projectreactor</groupId> + <artifactId>reactor-core</artifactId> + <version>3.3.8.RELEASE</version> + </dependency> - <dependency> - <groupId>com.microsoft.azure</groupId> - <artifactId>azure-storage</artifactId> - <version>8.6.5</version> - </dependency> + <dependency> + <groupId>com.microsoft.azure</groupId> + <artifactId>azure-storage</artifactId> + <version>8.6.5</version> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>2.25.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito2</artifactId> - <version>2.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>2.0.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - </exclusion> - <exclusion> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-test</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>2.25.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito2</artifactId> + <version>2.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>2.0.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + </exclusion> + <exclusion> + <groupId>org.junit.vintage</groupId> + <artifactId>junit-vintage-engine</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-test</artifactId> + <scope>test</scope> + </dependency> - <!-- App Insights dependencies --> - <dependency> - <groupId>com.microsoft.azure</groupId> - <artifactId>applicationinsights-spring-boot-starter</artifactId> - <version>2.6.1</version> - </dependency> - <dependency> - <groupId>com.microsoft.azure</groupId> - <artifactId>azure-spring-boot-metrics-starter</artifactId> - <version>2.3.3</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-log4j2</artifactId> - <version>2.3.1.RELEASE</version> - </dependency> - <dependency> - <groupId>com.microsoft.azure</groupId> - <artifactId>applicationinsights-logging-log4j2</artifactId> - <version>2.6.1</version> - </dependency> + <!-- App Insights dependencies --> + <dependency> + <groupId>com.microsoft.azure</groupId> + <artifactId>applicationinsights-spring-boot-starter</artifactId> + <version>2.6.1</version> + </dependency> + <dependency> + <groupId>com.microsoft.azure</groupId> + <artifactId>azure-spring-boot-metrics-starter</artifactId> + <version>2.3.3</version> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-log4j2</artifactId> + <version>2.3.1.RELEASE</version> + </dependency> + <dependency> + <groupId>com.microsoft.azure</groupId> + <artifactId>applicationinsights-logging-log4j2</artifactId> + <version>2.6.1</version> + </dependency> - </dependencies> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - <configuration> - <mainClass>org.opengroup.osdu.partition.provider.azure.PartitionApplication</mainClass> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + <configuration> + <classifier>spring-boot</classifier> + <mainClass>org.opengroup.osdu.partition.provider.azure.PartitionApplication</mainClass> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>