fixed suggestions / dep cleanup

.gitlab-ci.yml

@@ -166,8 +166,11 @@ download_plugins:
   image: maven:3.8.3-openjdk-17-slim
   stage: build
   variables:
-    OSM_PACKAGE_REGISTRY_URL: "https://community.opengroup.org/api/v4/projects/1448/packages/maven"
-    OSM_VERSION: "0.25.0-rc2"
+    OQM_PACKAGE_REGISRTY_URL: "https://community.opengroup.org/api/v4/projects/1450/packages/maven"
+    OQM_VERSION: "0.25.0-rc1"
+    APD_PACKAGE_REGISTRY_URL: "https://community.opengroup.org/api/v4/projects/1445/packages/maven"
+    APD_VERSION: "0.26.0-rc1"
+
 
   artifacts:
     paths:
@@ -176,7 +179,8 @@ download_plugins:
     expire_in: 1 days
 
   script:
-    - mvn dependency:copy -DrepoUrl=$OSM_PACKAGE_REGISTRY_URL -Dartifact="org.opengroup.osdu:os-osm-postgres:$OSM_VERSION:jar:plugin" -Dtransitive=false -DoutputDirectory="./tmp"
+    - mvn dependency:copy -DrepoUrl=$OQM_PACKAGE_REGISRTY_URL -Dartifact="org.opengroup.osdu:os-oqm-rabbitmq:$OQM_VERSION:jar:plugin" -Dtransitive=false -DoutputDirectory="./tmp"
+    - mvn dependency:copy -DrepoUrl=$APD_PACKAGE_REGISTRY_URL -Dartifact="org.opengroup.osdu:apd-openid:$APD_VERSION:jar:plugin" -Dtransitive=false -DoutputDirectory="./tmp"
 
   only:
     variables:

indexer-core-plus/cloudbuild/Dockerfile.cloudbuild → indexer-core-plus/cloudbuild/Dockerfile

@@ -9,7 +9,8 @@ ARG PORT
 ENV PORT $PORT
 
 # Copy plugins
-COPY tmp/os-osm-postgres-*.jar plugins/osm-postgres.jar
+COPY tmp/os-oqm-rabbitmq-*.jar plugins/oqm-rabbitmq.jar
+COPY tmp/apd-openid-*.jar plugins/apd-openid.jar
 
 # Copy the jar to the production image from the builder stage.
 COPY provider/indexer-${PROVIDER_NAME}/target/indexer-${PROVIDER_NAME}-*-spring-boot.jar indexer-${PROVIDER_NAME}.jar
@@ -29,4 +30,5 @@ CMD java  --add-opens java.base/java.lang=ALL-UNNAMED \
           -Dloader.path=plugins/ \
           -Dserver.port=${PORT} \
           -Dlog4j.formatMsgNoLookups=true \
+          -Dloader.main=org.opengroup.osdu.indexer.IndexerCorePlusApplication \
           -jar /app/indexer-${PROVIDER_NAME}.jar

indexer-core-plus/cloudbuild/cloudbuild.yaml

-# Copyright 2020 Google LLC
-# Copyright 2017-2019, Schlumberger
-# Copyright 2020 EPAM
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-steps:
-  - name: "gcr.io/cloud-builders/docker"
-    args:
-      [
-        "build",
-        "--build-arg",
-        "PROVIDER_NAME=${_PROVIDER_NAME}",
-        "--build-arg",
-        "PORT=${_PORT}",
-        "-t",
-        "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}:${_SHORT_SHA}",
-        "-t",
-        "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}:latest",
-        "-f",
-        "provider/${_GC_SERVICE}-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild",
-        ".",
-      ]
-
-images:
-  - "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}"

indexer-core-plus/pom.xml

@@ -152,6 +152,11 @@
             <artifactId>os-oqm-core</artifactId>
             <version>0.25.0-rc1</version>
         </dependency>
+        <dependency>
+            <groupId>org.opengroup.osdu</groupId>
+            <artifactId>apd-core</artifactId>
+            <version>0.26.0-rc1</version>
+        </dependency>
     </dependencies>
 
     <build>

indexer-core-plus/src/main/appengine/app.yaml

-# Copyright 2017-2019, Schlumberger
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-service: os-indexer
-
-runtime: java
-env: flex
-
-runtime_config:
-  jdk: openjdk8
-
-api_version: 1
-threadsafe: yes
-
-resources:
-  cpu: 1
-  memory_gb: 2.4
-  disk_size_gb: 10
-
-handlers:
-  - url: /.*
-    script: this field is required, but ignored
-
-env_variables:
-  AUTHORIZE_API: "AUTHORIZE_API_VAR"
-  CRON_JOB_IP: "CRON_JOB_IP_VAR"
-  LEGAL_HOSTNAME: "LEGAL_HOSTNAME_VAR"
-  REGION: "REGION_VAR"
-  SPRING_PROFILES_ACTIVE: 'ENVIRONMENT'
-  SECURITY_HTTPS_CERTIFICATE_TRUST: 'SECURITY_HTTPS_CERTIFICATE_TRUST_VAR'