From 244d407971298a42b24bdf8029e76a298d20ec5b Mon Sep 17 00:00:00 2001 From: David Diederich <d.diederich@opengroup.org> Date: Wed, 10 Feb 2021 00:48:25 -0500 Subject: [PATCH] Updating all POM files to match the same version number --- crs-converter-core/pom.xml | 270 +++++++++--------- pom.xml | 3 +- provider/crs-converter-aws/pom.xml | 9 +- .../crs-converter-aks/pom.xml | 165 ++++++----- .../crs-converter-gae/pom.xml | 175 ++++++------ .../crs-converter-gke/pom.xml | 107 ++++--- .../crs-converter-ocp/pom.xml | 9 +- 7 files changed, 365 insertions(+), 373 deletions(-) diff --git a/crs-converter-core/pom.xml b/crs-converter-core/pom.xml index 205730e8..4e006a11 100644 --- a/crs-converter-core/pom.xml +++ b/crs-converter-core/pom.xml @@ -1,136 +1,134 @@ -<?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/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - - <parent> - <groupId>org.opengroup.osdu.crs-converter-service</groupId> - <artifactId>crs-converter-service</artifactId> - <version>1.0.0</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <properties> - <app.version>1</app.version> - <app.id>crs-converter-core</app.id> - </properties> - - <prerequisites> - <maven>3.1.0</maven> - </prerequisites> - - <artifactId>crs-converter-core</artifactId> - <version>1.0.0</version> - <name>crs-converter-core</name> - <description>CRS converter service core</description> - - <dependencies> - <!-- osdu dependencies --> - <dependency> - <groupId>org.opengroup.osdu</groupId> - <artifactId>os-core-common</artifactId> - <version>0.0.20</version> - </dependency> - - <!-- auth0 dependencies --> - <dependency> - <groupId>com.auth0</groupId> - <artifactId>jwks-rsa</artifactId> - <version>0.11.0</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-config</artifactId> - </dependency> - <!-- lombok dependencies --> - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - <version>1.18.10</version> - <scope>provided</scope> - </dependency> - - <!-- logging dependencies --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.2.3</version> - </dependency> - - <!-- swagger dependencies --> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger2</artifactId> - <version>${springfox-version}</version> - </dependency> - <dependency> - <groupId>io.springfox</groupId> - <artifactId>springfox-swagger-ui</artifactId> - <version>${springfox-version}</version> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>${powermock.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito2</artifactId> - <version>${powermock.version}</version> - <scope>test</scope> - </dependency> - - <!-- dependencies for apache sis --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>1.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-referencing</artifactId> - <version>1.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-referencing-by-identifiers</artifactId> - <version>1.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>1.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.14.2.0</version> - </dependency> - <dependency> - <groupId>org.opengis</groupId> - <artifactId>geoapi</artifactId> - <version>3.0.1</version> - </dependency> - <dependency> - <groupId>jakarta.xml.bind</groupId> - <artifactId>jakarta.xml.bind-api</artifactId> - <version>2.3.2</version> - </dependency> - </dependencies> -</project> +<?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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + + <parent> + <groupId>org.opengroup.osdu.crs-converter-service</groupId> + <artifactId>crs-converter-service</artifactId> + <version>0.6.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <properties> + <app.version>1</app.version> + <app.id>crs-converter-core</app.id> + </properties> + + <prerequisites> + <maven>3.1.0</maven> + </prerequisites> + + <artifactId>crs-converter-core</artifactId> + <version>0.6.0-SNAPSHOT</version> + <name>crs-converter-core</name> + <description>CRS converter service core</description> + + <dependencies> + <!-- osdu dependencies --> + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>os-core-common</artifactId> + <version>0.0.20</version> + </dependency> + + <!-- auth0 dependencies --> + <dependency> + <groupId>com.auth0</groupId> + <artifactId>jwks-rsa</artifactId> + <version>0.11.0</version> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-config</artifactId> + </dependency> + <!-- lombok dependencies --> + <dependency> + <groupId>org.projectlombok</groupId> + <artifactId>lombok</artifactId> + <version>1.18.10</version> + <scope>provided</scope> + </dependency> + + <!-- logging dependencies --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.3</version> + </dependency> + + <!-- swagger dependencies --> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger2</artifactId> + <version>${springfox-version}</version> + </dependency> + <dependency> + <groupId>io.springfox</groupId> + <artifactId>springfox-swagger-ui</artifactId> + <version>${springfox-version}</version> + </dependency> + + <!-- test dependencies --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito2</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + + <!-- dependencies for apache sis --> + <dependency> + <groupId>org.apache.sis.core</groupId> + <artifactId>sis-metadata</artifactId> + <version>1.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.sis.core</groupId> + <artifactId>sis-referencing</artifactId> + <version>1.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.sis.core</groupId> + <artifactId>sis-referencing-by-identifiers</artifactId> + <version>1.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.sis.core</groupId> + <artifactId>sis-utility</artifactId> + <version>1.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.derby</groupId> + <artifactId>derby</artifactId> + <version>10.14.2.0</version> + </dependency> + <dependency> + <groupId>org.opengis</groupId> + <artifactId>geoapi</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>2.3.2</version> + </dependency> + </dependencies> +</project> diff --git a/pom.xml b/pom.xml index 1525659f..520c3f42 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@ <?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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> diff --git a/provider/crs-converter-aws/pom.xml b/provider/crs-converter-aws/pom.xml index 3c277456..54c94f7f 100644 --- a/provider/crs-converter-aws/pom.xml +++ b/provider/crs-converter-aws/pom.xml @@ -14,21 +14,20 @@ See the License for the specific language governing permissions and limitations under the License. --> -<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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.opengroup.osdu.crs-converter-service</groupId> <artifactId>crs-converter-service</artifactId> - <version>1.0.0</version> + <version>0.6.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.crs-converter-service</groupId> <artifactId>crs-converter-aws</artifactId> - <version>1.0.0</version> + <version>0.6.0-SNAPSHOT</version> <packaging>jar</packaging> <name>crs-converter-aws</name> <description>CRS Converter service on AWS</description> @@ -56,7 +55,7 @@ <dependency> <groupId>org.opengroup.osdu.crs-converter-service</groupId> <artifactId>crs-converter-core</artifactId> - <version>1.0.0</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/provider/crs-converter-azure/crs-converter-aks/pom.xml b/provider/crs-converter-azure/crs-converter-aks/pom.xml index 9c50f212..1ddcd444 100644 --- a/provider/crs-converter-azure/crs-converter-aks/pom.xml +++ b/provider/crs-converter-azure/crs-converter-aks/pom.xml @@ -1,83 +1,82 @@ -<?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - - <parent> - <groupId>org.opengroup.osdu.crs-converter-service</groupId> - <artifactId>crs-converter-service</artifactId> - <version>1.0.0</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <properties> - <app.version>1</app.version> - <app.id>crs-converter-aks</app.id> - <azure.version>2.3.2</azure.version> - <osdu.corelibazure.version>0.0.42</osdu.corelibazure.version> - </properties> - - <prerequisites> - <maven>3.1.0</maven> - </prerequisites> - - <artifactId>crs-converter-aks</artifactId> - <version>1.0.1-SNAPSHOT</version> - <name>crs-converter-aks</name> - <description>CRS converter service Azure Kubernetes Deployment</description> - - <dependencies> - <dependency> - <groupId>org.opengroup.osdu.crs-converter-service</groupId> - <artifactId>crs-converter-core</artifactId> - <version>1.0.0</version> - </dependency> - - <dependency> - <groupId>org.opengroup.osdu</groupId> - <artifactId>core-lib-azure</artifactId> - <version>${osdu.corelibazure.version}</version> - </dependency> - - <dependency> - <groupId>com.microsoft.azure</groupId> - <artifactId>azure-active-directory-spring-boot-starter</artifactId> - <version>${azure.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-logging</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - - <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.crs.CRSApplication</mainClass> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - -</project> +<?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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + + <parent> + <groupId>org.opengroup.osdu.crs-converter-service</groupId> + <artifactId>crs-converter-service</artifactId> + <version>0.6.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + + <properties> + <app.version>1</app.version> + <app.id>crs-converter-aks</app.id> + <azure.version>2.3.2</azure.version> + <osdu.corelibazure.version>0.0.42</osdu.corelibazure.version> + </properties> + + <prerequisites> + <maven>3.1.0</maven> + </prerequisites> + + <artifactId>crs-converter-aks</artifactId> + <version>0.6.0-SNAPSHOT</version> + <name>crs-converter-aks</name> + <description>CRS converter service Azure Kubernetes Deployment</description> + + <dependencies> + <dependency> + <groupId>org.opengroup.osdu.crs-converter-service</groupId> + <artifactId>crs-converter-core</artifactId> + <version>0.6.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>core-lib-azure</artifactId> + <version>${osdu.corelibazure.version}</version> + </dependency> + + <dependency> + <groupId>com.microsoft.azure</groupId> + <artifactId>azure-active-directory-spring-boot-starter</artifactId> + <version>${azure.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <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.crs.CRSApplication</mainClass> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/provider/crs-converter-gcp/crs-converter-gae/pom.xml b/provider/crs-converter-gcp/crs-converter-gae/pom.xml index 8ad4eb29..0aa2ebbf 100644 --- a/provider/crs-converter-gcp/crs-converter-gae/pom.xml +++ b/provider/crs-converter-gcp/crs-converter-gae/pom.xml @@ -1,88 +1,87 @@ -<?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - - <parent> - <groupId>org.opengroup.osdu.crs-converter-service</groupId> - <artifactId>crs-converter-service</artifactId> - <version>1.0.0</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <properties> - <app.version>1</app.version> - <app.id>crs-converter-gae</app.id> - - <appengine.app.version>1</appengine.app.version> - <appengine.plugin.version>1.9.73</appengine.plugin.version> - <appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version> - </properties> - - <prerequisites> - <maven>3.1.0</maven> - </prerequisites> - - <artifactId>crs-converter-gae</artifactId> - <version>1.0.0</version> - <name>crs-converter-gae</name> - <description>CRS converter service Google App Engine deployment</description> - - <dependencies> - <dependency> - <groupId>org.opengroup.osdu.crs-converter-service</groupId> - <artifactId>crs-converter-core</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-oauth2-client</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-jwt</artifactId> - <version>1.0.10.RELEASE</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - - <plugin> - <groupId>com.google.cloud.tools</groupId> - <artifactId>appengine-maven-plugin</artifactId> - <version>${appengine.maven.plugin.version}</version> - <configuration> - <!-- deploy configuration --> - <stage.enableJarSplitting>true</stage.enableJarSplitting> - <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion> - </configuration> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.7.201606060606</version> - <executions> - <execution> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> +<?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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + + <parent> + <groupId>org.opengroup.osdu.crs-converter-service</groupId> + <artifactId>crs-converter-service</artifactId> + <version>0.6.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + + <properties> + <app.version>1</app.version> + <app.id>crs-converter-gae</app.id> + + <appengine.app.version>1</appengine.app.version> + <appengine.plugin.version>1.9.73</appengine.plugin.version> + <appengine.maven.plugin.version>1.3.2</appengine.maven.plugin.version> + </properties> + + <prerequisites> + <maven>3.1.0</maven> + </prerequisites> + + <artifactId>crs-converter-gae</artifactId> + <version>0.6.0-SNAPSHOT</version> + <name>crs-converter-gae</name> + <description>CRS converter service Google App Engine deployment</description> + + <dependencies> + <dependency> + <groupId>org.opengroup.osdu.crs-converter-service</groupId> + <artifactId>crs-converter-core</artifactId> + <version>0.6.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-oauth2-client</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-jwt</artifactId> + <version>1.0.10.RELEASE</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>com.google.cloud.tools</groupId> + <artifactId>appengine-maven-plugin</artifactId> + <version>${appengine.maven.plugin.version}</version> + <configuration> + <!-- deploy configuration --> + <stage.enableJarSplitting>true</stage.enableJarSplitting> + <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion> + </configuration> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.7.201606060606</version> + <executions> + <execution> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>report</id> + <phase>prepare-package</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/provider/crs-converter-gcp/crs-converter-gke/pom.xml b/provider/crs-converter-gcp/crs-converter-gke/pom.xml index bcf05c22..eb415062 100644 --- a/provider/crs-converter-gcp/crs-converter-gke/pom.xml +++ b/provider/crs-converter-gcp/crs-converter-gke/pom.xml @@ -1,54 +1,53 @@ -<?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <packaging>jar</packaging> - - <parent> - <groupId>org.opengroup.osdu.crs-converter-service</groupId> - <artifactId>crs-converter-service</artifactId> - <version>1.0.0</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <properties> - <app.version>1</app.version> - <app.id>crs-converter-gke</app.id> - </properties> - - <prerequisites> - <maven>3.1.0</maven> - </prerequisites> - - <artifactId>crs-converter-gke</artifactId> - <version>1.0.0</version> - <name>crs-converter-gke</name> - <description>CRS converter service Google Kubernetes Engine deployment</description> - - <dependencies> - <dependency> - <groupId>org.opengroup.osdu.crs-converter-service</groupId> - <artifactId>crs-converter-core</artifactId> - <version>1.0.0</version> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-oauth2-client</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.security</groupId> - <artifactId>spring-security-jwt</artifactId> - <version>1.0.10.RELEASE</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - -</project> +<?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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <packaging>jar</packaging> + + <parent> + <groupId>org.opengroup.osdu.crs-converter-service</groupId> + <artifactId>crs-converter-service</artifactId> + <version>0.6.0-SNAPSHOT</version> + <relativePath>../../../pom.xml</relativePath> + </parent> + + <properties> + <app.version>1</app.version> + <app.id>crs-converter-gke</app.id> + </properties> + + <prerequisites> + <maven>3.1.0</maven> + </prerequisites> + + <artifactId>crs-converter-gke</artifactId> + <version>0.6.0-SNAPSHOT</version> + <name>crs-converter-gke</name> + <description>CRS converter service Google Kubernetes Engine deployment</description> + + <dependencies> + <dependency> + <groupId>org.opengroup.osdu.crs-converter-service</groupId> + <artifactId>crs-converter-core</artifactId> + <version>0.6.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-oauth2-client</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.security</groupId> + <artifactId>spring-security-jwt</artifactId> + <version>1.0.10.RELEASE</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + </plugin> + </plugins> + </build> + +</project> diff --git a/provider/crs-converter-ibm/crs-converter-ocp/pom.xml b/provider/crs-converter-ibm/crs-converter-ocp/pom.xml index 8fbc9e7f..bd066cdf 100644 --- a/provider/crs-converter-ibm/crs-converter-ocp/pom.xml +++ b/provider/crs-converter-ibm/crs-converter-ocp/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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> <parent> <groupId>org.opengroup.osdu.crs-converter-service</groupId> <artifactId>crs-converter-service</artifactId> - <version>1.0.0</version> + <version>0.6.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> @@ -23,7 +22,7 @@ </prerequisites> <artifactId>crs-converter-ocp</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <name>crs-converter-ocp</name> <description>CRS converter service Openshift Container Platform deployment</description> @@ -31,7 +30,7 @@ <dependency> <groupId>org.opengroup.osdu.crs-converter-service</groupId> <artifactId>crs-converter-core</artifactId> - <version>1.0.0</version> + <version>0.6.0-SNAPSHOT</version> </dependency> <!--dependency> -- GitLab