diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 68820a59c9524000cdc9aaca1c894d11f5836888..cb60cfba0943f0894b436d9431d11f2cfacf2f5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,18 @@ include:
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/core-global.yml"
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/aws-one-pipeline.yml"
+
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/azure-one-pipeline.yml"
+
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/gc-one-pipeline.yml"
+
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/ibm-one-pipeline.yml"
+
# aws
- local: "devops/aws/pipeline/override-stages.yml"
diff --git a/NOTICE b/NOTICE
index 308cfc73e2c28da781e67f8ee4d99a747ccb04c3..6ae25fd454ad7dffe4a8a0cb5f907eb2bc70bf73 100644
--- a/NOTICE
+++ b/NOTICE
@@ -102,7 +102,7 @@ The following software have components provided under the terms of this license:
- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson, https://github.com/FasterXML/jackson-dataformats-text)
- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
- Jakarta Dependency Injection (from https://github.com/eclipse-ee4j/injection-api)
-- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://maven.atlassian.com/3rdparty/jakarta/ws/rs/jakarta.ws.rs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
+- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- Jakarta Validation API (from https://beanvalidation.org)
- Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
@@ -294,7 +294,7 @@ The following software have components provided under the terms of this license:
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Jakarta Messaging API (from https://projects.eclipse.org/projects/ee4j.jms)
-- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://maven.atlassian.com/3rdparty/jakarta/ws/rs/jakarta.ws.rs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
+- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
- Jakarta WebSocket - Client API (from https://projects.eclipse.org/projects/ee4j.websocket)
- Jakarta WebSocket - Server API (from https://projects.eclipse.org/projects/ee4j.websocket, https://repo1.maven.org/maven2/org/jboss/spec/javax/websocket/jboss-websocket-api_1.1_spec)
- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
@@ -401,7 +401,7 @@ The following software have components provided under the terms of this license:
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Jakarta Dependency Injection (from https://github.com/eclipse-ee4j/injection-api)
- Jakarta Messaging API (from https://projects.eclipse.org/projects/ee4j.jms)
-- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://maven.atlassian.com/3rdparty/jakarta/ws/rs/jakarta.ws.rs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
+- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- Jakarta Validation API (from https://beanvalidation.org)
- Jakarta WebSocket - Client API (from https://projects.eclipse.org/projects/ee4j.websocket)
@@ -419,7 +419,7 @@ The following software have components provided under the terms of this license:
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Jakarta Dependency Injection (from https://github.com/eclipse-ee4j/injection-api)
- Jakarta Messaging API (from https://projects.eclipse.org/projects/ee4j.jms)
-- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://maven.atlassian.com/3rdparty/jakarta/ws/rs/jakarta.ws.rs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
+- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
- Jakarta Servlet (from https://projects.eclipse.org/projects/ee4j.servlet)
- Jakarta Validation API (from https://beanvalidation.org)
- Jakarta WebSocket - Client API (from https://projects.eclipse.org/projects/ee4j.websocket)
@@ -551,7 +551,7 @@ efsl-1.0
========================================================================
The following software have components provided under the terms of this license:
-- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://maven.atlassian.com/3rdparty/jakarta/ws/rs/jakarta.ws.rs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
+- Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api, https://repo1.maven.org/maven2/jakarta/ws/rs/jakarta.ws.rs-api)
========================================================================
gpl-2.0-classpath
diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index abe069c531d52f5f7465af6cb85b4fe414512ebc..d2551a40c2174a85ae492d4d7e82d000b19b5c81 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -23,7 +23,7 @@ download_gc_plugins:
- $GC == '1'
gc-containerize-gitlab:
- needs: ["compile-and-unit-test", "download_gc_plugins"]
+ needs: ["gc-compile-and-unit-test", "download_gc_plugins"]
gc-test:
variables:
diff --git a/pom.xml b/pom.xml
index 339ea56d55e422450f47a40cac019c0644d8d00f..fd33957bf688055d848a3532580bf3bd2ca6361a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,15 +168,6 @@
</dependency>
</dependencies>
- <modules>
- <module>notification-core</module>
- <module>provider/notification-gc</module>
- <module>provider/notification-azure</module>
- <module>provider/notification-ibm</module>
- <module>provider/notification-aws</module>
- <module>notification-core-plus</module>
- </modules>
-
<repositories>
<repository>
<id>${repo.releases.id}</id>
@@ -195,25 +186,6 @@
</snapshotRepository>
</distributionManagement>
- <profiles>
- <profile>
- <id>Default</id>
- <activation>
- <property>
- <name>!repo.releases.id</name>
- </property>
- </activation>
- <properties>
- <repo.releases.id>community-maven-repo</repo.releases.id>
- <publish.snapshots.id>community-maven-via-job-token</publish.snapshots.id>
- <publish.releases.id>community-maven-via-job-token</publish.releases.id>
- <repo.releases.url>https://community.opengroup.org/api/v4/groups/17/-/packages/maven</repo.releases.url>
- <publish.snapshots.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.snapshots.url>
- <publish.releases.url>https://community.opengroup.org/api/v4/projects/143/packages/maven</publish.releases.url>
- </properties>
- </profile>
- </profiles>
-
<build>
<pluginManagement>
<plugins>
@@ -255,4 +227,42 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>core</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>notification-core</module>
+ <module>notification-core-plus</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>aws</id>
+ <modules>
+ <module>provider/notification-aws</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>azure</id>
+ <modules>
+ <module>provider/notification-azure</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>ibm</id>
+ <modules>
+ <module>provider/notification-ibm</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>gc</id>
+ <modules>
+ <module>provider/notification-gc</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
diff --git a/provider/notification-aws/build-aws/buildspec.yaml b/provider/notification-aws/build-aws/buildspec.yaml
index bdd553733f044b0af8141b3d5d4a07517ed6fba4..a96a38e8e22714954232eb2a250edb640fc581a2 100644
--- a/provider/notification-aws/build-aws/buildspec.yaml
+++ b/provider/notification-aws/build-aws/buildspec.yaml
@@ -69,8 +69,8 @@ phases:
- if [ "$GIT_SECRETS_SCAN_RESULT" = "FAILED" ]; then echo "Secrets detected!" && exit 1; fi
- echo "Building primary service assemblies..."
- - mvn --no-transfer-progress -ntp -B test install -pl .,notification-core,provider/notification-aws -Ddeployment.environment=prod
- - mvn --no-transfer-progress sonar:sonar -pl .,provider/notification-aws -Dsonar.scm.provider=git -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.host.url=${SONAR_URL}
+ - mvn --no-transfer-progress -ntp -B test install -pl .,notification-core,provider/notification-aws -P core, aws -Ddeployment.environment=prod
+ - mvn --no-transfer-progress sonar:sonar -pl .,provider/notification-aws -P aws -Dsonar.scm.provider=git -Dsonar.login=${SONAR_USERNAME} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.branch.name=${BRANCH_NAME} -Dsonar.host.url=${SONAR_URL}
- echo "Building integration testing assemblies and gathering artifacts..."
- ./testing/notification-test-aws/build-aws/prepare-dist.sh