Commit 473b6b1f authored by Sanjeev-SLB's avatar Sanjeev-SLB
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/search-service into virtual-service
parents 616c9253 3b9525e3
Pipeline #66666 failed with stages
in 11 seconds
...@@ -53,7 +53,10 @@ include: ...@@ -53,7 +53,10 @@ include:
file: "scanners/gitlab-ultimate.yml" file: "scanners/gitlab-ultimate.yml"
- project: "osdu/platform/ci-cd-pipelines" - project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/aws.yml" file: "cloud-providers/aws-global.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/aws-maven.yml"
- project: "osdu/platform/ci-cd-pipelines" - project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/ibm.yml" file: "cloud-providers/ibm.yml"
......
This diff is collapsed.
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<log4j-core.version>2.13.2</log4j-core.version> <log4j-core.version>2.13.2</log4j-core.version>
<google-oauth-client.version>1.31.0</google-oauth-client.version> <google-oauth-client.version>1.31.0</google-oauth-client.version>
<commons-compress.version>1.20</commons-compress.version> <commons-compress.version>1.20</commons-compress.version>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
<tomcat-embed-core.version>9.0.45</tomcat-embed-core.version> <tomcat-embed-core.version>9.0.45</tomcat-embed-core.version>
</properties> </properties>
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<aws.version>1.11.1018</aws.version> <aws.version>1.11.1018</aws.version>
<deployment.environment>dev</deployment.environment> <deployment.environment>dev</deployment.environment>
<version.number>0.0.4-SNAPSHOT</version.number> <version.number>0.0.4-SNAPSHOT</version.number>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu.core.aws</groupId> <groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId> <artifactId>os-core-lib-aws</artifactId>
<version>0.11.0-SNAPSHOT</version> <version>0.11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<project.main.basedir>${project.parent.basedir}</project.main.basedir> <project.main.basedir>${project.parent.basedir}</project.main.basedir>
<springboot.version>2.1.7.RELEASE</springboot.version> <springboot.version>2.1.7.RELEASE</springboot.version>
<osdu.corelibazure.version>0.10.1</osdu.corelibazure.version> <osdu.corelibazure.version>0.10.1</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
<osdu.search-core.version>0.12.0-SNAPSHOT</osdu.search-core.version> <osdu.search-core.version>0.12.0-SNAPSHOT</osdu.search-core.version>
<spatial4j.version>0.7</spatial4j.version> <spatial4j.version>0.7</spatial4j.version>
<jts-io-common.version>1.15.0</jts-io-common.version> <jts-io-common.version>1.15.0</jts-io-common.version>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<project.main.basedir>${project.parent.basedir}</project.main.basedir> <project.main.basedir>${project.parent.basedir}</project.main.basedir>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<project.main.basedir>${project.parent.basedir}</project.main.basedir> <project.main.basedir>${project.parent.basedir}</project.main.basedir>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<properties> <properties>
<os-core-lib-ibm.version>0.10.0</os-core-lib-ibm.version> <os-core-lib-ibm.version>0.10.0</os-core-lib-ibm.version>
<start-class>org.opengroup.osdu.search.provider.ibm.app.SearchIBMApplication</start-class> <start-class>org.opengroup.osdu.search.provider.ibm.app.SearchIBMApplication</start-class>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
</properties> </properties>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<project.main.basedir>${project.parent.basedir}</project.main.basedir> <project.main.basedir>${project.parent.basedir}</project.main.basedir>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<project.main.basedir>${project.basedir}</project.main.basedir> <project.main.basedir>${project.basedir}</project.main.basedir>
<nimbus-jose-jwt.version>9.1.2</nimbus-jose-jwt.version> <nimbus-jose-jwt.version>9.1.2</nimbus-jose-jwt.version>
<elasticsearch.version>7.8.1</elasticsearch.version> <elasticsearch.version>7.8.1</elasticsearch.version>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<cucumber.version>1.2.5</cucumber.version> <cucumber.version>1.2.5</cucumber.version>
<elasticsearch.version>7.8.1</elasticsearch.version> <elasticsearch.version>7.8.1</elasticsearch.version>
<osdu.oscorecommon.version>0.11.0-SNAPSHOT</osdu.oscorecommon.version> <osdu.oscorecommon.version>0.11.0</osdu.oscorecommon.version>
</properties> </properties>
<dependencies> <dependencies>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment