From 39ab5034b01ce7da96b8e5abba49be1665663443 Mon Sep 17 00:00:00 2001
From: "Marc Burnie [AWS]" <mburnie@amazon.com>
Date: Fri, 7 Mar 2025 20:47:27 +0000
Subject: [PATCH] Merge branch 'aws-fix-build' into 'master'
Aws fix build
See merge request osdu/platform/system/notification!562
(cherry picked from commit d29f88efeafe0ea552e7179e9995683e79640953)
4c73ba19 Fix for AWS internal build.
ea65e666 Fixed another issue.
Co-authored-by: Derek Hudson <dhudsons@amazon.com>
---
provider/notification-aws/build-aws/buildspec.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/provider/notification-aws/build-aws/buildspec.yaml b/provider/notification-aws/build-aws/buildspec.yaml
index a96a38e8e..4a873e626 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 -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}
+ - mvn --no-transfer-progress -ntp -B test install -P core,aws -Ddeployment.environment=prod
+ - mvn --no-transfer-progress sonar:sonar -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
@@ -100,4 +100,4 @@ artifacts:
name: ${BRANCH_NAME}/${PACKAGE_NAME}.zip
cache:
paths:
- - "/root/.m2/**/*"
\ No newline at end of file
+ - "/root/.m2/**/*"
--
GitLab