Skip to content
Snippets Groups Projects
Commit 56e462b7 authored by Alok Joshi's avatar Alok Joshi
Browse files

Merge branch 'master' of... 

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/indexer-service into integration_test_fix
parents b46e4af9 134c744f
No related branches found
No related tags found
1 merge request!118Defensive update to resolve tagging Integration tests issue
Pipeline #32221 failed
Stage: review
Stage: build
Stage: containerize
Stage: scan
Stage: deploy
Stage: integration
Stage: attribution
Hide whitespace changes
Inline Side-by-side
Showing
with 32 additions and 32 deletions
indexer-core/pom.xml
+ 2
− 2
View file @ 56e462b7
......@@ -4,12 +4,12 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>indexer-core</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<name>indexer-core</name>
<description>Indexer Service Core</description>
<packaging>jar</packaging>
......
pom.xml
+ 1
− 1
View file @ 56e462b7
......@@ -12,7 +12,7 @@
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<packaging>pom</packaging>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<description>Indexer Service</description>
<properties>
......
provider/indexer-aws/pom.xml
+ 3
− 3
View file @ 56e462b7
......@@ -18,7 +18,7 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......@@ -26,7 +26,7 @@
<artifactId>indexer-aws</artifactId>
<description>Storage service on AWS</description>
<packaging>jar</packaging>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<properties>
<aws.version>1.11.637</aws.version>
......@@ -43,7 +43,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
......
provider/indexer-azure/pom.xml
+ 3
− 3
View file @ 56e462b7
......@@ -21,12 +21,12 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-azure</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<name>indexer-azure</name>
<description>Indexer Service Azure</description>
<packaging>jar</packaging>
......@@ -39,7 +39,7 @@
<azure.appservice.subscription />
<log4j.version>2.11.2</log4j.version>
<nimbus-jose-jwt.version>8.2</nimbus-jose-jwt.version>
<indexer-core.version>0.6.0-SNAPSHOT</indexer-core.version>
<indexer-core.version>0.8.0-SNAPSHOT</indexer-core.version>
<spring-security-jwt.version>1.1.1.RELEASE</spring-security-jwt.version>
<osdu.corelibazure.version>0.0.42</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.6.5</osdu.oscorecommon.version>
......
provider/indexer-gcp/pom.xml
+ 3
− 3
View file @ 56e462b7
......@@ -5,12 +5,12 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-gcp</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<name>indexer-gcp</name>
<description>Indexer Service GCP App Engine</description>
<packaging>jar</packaging>
......@@ -19,7 +19,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
......
provider/indexer-ibm/pom.xml
+ 2
− 2
View file @ 56e462b7
......@@ -21,7 +21,7 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
......@@ -53,7 +53,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
......
provider/indexer-reference/pom.xml
+ 3
− 3
View file @ 56e462b7
......@@ -22,12 +22,12 @@
<parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-service</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>indexer-reference</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<name>indexer-reference</name>
<description>Indexer Service GCP Anthos</description>
<packaging>jar</packaging>
......@@ -36,7 +36,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-core</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
......
testing/indexer-test-aws/pom.xml
+ 3
− 3
View file @ 56e462b7
......@@ -21,13 +21,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-aws</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -42,7 +42,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
<version>0.6.1-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<!-- AWS specific packages -->
......
testing/indexer-test-azure/pom.xml
+ 4
− 4
View file @ 56e462b7
......@@ -21,13 +21,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-azure</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -45,7 +45,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
<version>0.6.1-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<!-- Azure dependencies -->
......@@ -185,4 +185,4 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
</project>
testing/indexer-test-core/pom.xml
+ 2
− 2
View file @ 56e462b7
......@@ -5,13 +5,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
<version>0.6.1-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
......
testing/indexer-test-gcp/pom.xml
+ 3
− 3
View file @ 56e462b7
......@@ -6,13 +6,13 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-gcp</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
......@@ -37,7 +37,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
<version>0.6.1-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<!-- Cucumber -->
......
testing/indexer-test-ibm/pom.xml
+ 2
− 2
View file @ 56e462b7
......@@ -6,7 +6,7 @@
<parent>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......@@ -38,7 +38,7 @@
<dependency>
<groupId>org.opengroup.osdu.indexer</groupId>
<artifactId>indexer-test-core</artifactId>
<version>0.6.1-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
</dependency>
<dependency>
......
testing/pom.xml
+ 1
− 1
View file @ 56e462b7
......@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu</groupId>
<artifactId>indexer-test</artifactId>
<version>0.6.0-SNAPSHOT</version>
<version>0.8.0-SNAPSHOT</version>
<description>Indexer Service Integration Test Root Project</description>
<properties>
<spring.version>5.1.19.RELEASE</spring.version>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment