From 3d1b0b28836e29f58af2398edaf2d6b89cf911f5 Mon Sep 17 00:00:00 2001
From: Bill Wang <wanzhiji@amazon.com>
Date: Mon, 4 Jan 2021 22:16:38 +0000
Subject: [PATCH] Squashed commit of the following
supress maven transport progress
update core service version
bump indexer testing pom version
---
provider/indexer-aws/build-aws/buildspec.yaml | 4 ++--
provider/indexer-aws/pom.xml | 2 +-
testing/indexer-test-aws/build-aws/prepare-dist.sh | 10 +++++-----
testing/indexer-test-aws/build-aws/run-tests.sh | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/provider/indexer-aws/build-aws/buildspec.yaml b/provider/indexer-aws/build-aws/buildspec.yaml
index 36ee74d85..7f263524d 100644
--- a/provider/indexer-aws/build-aws/buildspec.yaml
+++ b/provider/indexer-aws/build-aws/buildspec.yaml
@@ -57,7 +57,7 @@ phases:
- printenv
- echo "Building primary service assemblies..."
- - mvn -B test install -pl indexer-core,provider/indexer-aws -Ddeployment.environment=prod
+ - mvn -ntp -B test install -pl indexer-core,provider/indexer-aws -Ddeployment.environment=prod
# - echo "Copying assemblies to dist..."
@@ -95,4 +95,4 @@ artifacts:
name: ${REPO_NAME}_${BRANCH_NAME}_$(date +%F)_${CODEBUILD_BUILD_NUMBER}.zip
cache:
paths:
- - "/root/.m2/**/*"
\ No newline at end of file
+ - "/root/.m2/**/*"
diff --git a/provider/indexer-aws/pom.xml b/provider/indexer-aws/pom.xml
index bc756ab12..b8e13f22e 100644
--- a/provider/indexer-aws/pom.xml
+++ b/provider/indexer-aws/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.3.7</version>
+ <version>0.3.16</version>
</dependency>
<!-- AWS managed packages -->
diff --git a/testing/indexer-test-aws/build-aws/prepare-dist.sh b/testing/indexer-test-aws/build-aws/prepare-dist.sh
index 86ce9d208..ee2afc827 100755
--- a/testing/indexer-test-aws/build-aws/prepare-dist.sh
+++ b/testing/indexer-test-aws/build-aws/prepare-dist.sh
@@ -21,13 +21,13 @@ echo $INTEGRATION_TEST_OUTPUT_BIN_DIR
rm -rf "$INTEGRATION_TEST_OUTPUT_DIR"
mkdir -p "$INTEGRATION_TEST_OUTPUT_DIR" && mkdir -p "$INTEGRATION_TEST_OUTPUT_BIN_DIR"
echo "Building integration testing assemblies and gathering artifacts..."
-mvn install -f "$INTEGRATION_TEST_SOURCE_DIR_CORE"/pom.xml
-mvn install dependency:copy-dependencies -DskipTests -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml -DincludeGroupIds=org.opengroup.osdu -Dmdep.copyPom
+mvn -ntp install -f "$INTEGRATION_TEST_SOURCE_DIR_CORE"/pom.xml
+mvn -ntp install dependency:copy-dependencies -DskipTests -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml -DincludeGroupIds=org.opengroup.osdu -Dmdep.copyPom
cp "$INTEGRATION_TEST_SOURCE_DIR_AWS"/target/dependency/* "${INTEGRATION_TEST_OUTPUT_BIN_DIR}"
-(cd "${INTEGRATION_TEST_OUTPUT_BIN_DIR}" && ls *.jar | sed -e 's/\.jar$//' | xargs -I {} echo mvn install:install-file -Dfile={}.jar -DpomFile={}.pom >> install-deps.sh)
+(cd "${INTEGRATION_TEST_OUTPUT_BIN_DIR}" && ls *.jar | sed -e 's/\.jar$//' | xargs -I {} echo mvn -ntp install:install-file -Dfile={}.jar -DpomFile={}.pom >> install-deps.sh)
chmod +x "${INTEGRATION_TEST_OUTPUT_BIN_DIR}"/install-deps.sh
-mvn clean -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml
+mvn -ntp clean -f "$INTEGRATION_TEST_SOURCE_DIR_AWS"/pom.xml
cp -R "$INTEGRATION_TEST_SOURCE_DIR_AWS"/* "${INTEGRATION_TEST_OUTPUT_DIR}"/
#copy testing parent pom to output
-cp "$INTEGRATION_TEST_SOURCE_DIR/pom.xml" "${OUTPUT_DIR}/testing"
\ No newline at end of file
+cp "$INTEGRATION_TEST_SOURCE_DIR/pom.xml" "${OUTPUT_DIR}/testing"
diff --git a/testing/indexer-test-aws/build-aws/run-tests.sh b/testing/indexer-test-aws/build-aws/run-tests.sh
index f1124ee28..5b56779a9 100755
--- a/testing/indexer-test-aws/build-aws/run-tests.sh
+++ b/testing/indexer-test-aws/build-aws/run-tests.sh
@@ -30,7 +30,7 @@ export STORAGE_HOST=$STORAGE_URL
#### RUN INTEGRATION TEST #########################################################################
-mvn test -f "$SCRIPT_SOURCE_DIR"/../pom.xml -Dcucumber.options="--plugin junit:target/junit-report.xml"
+mvn -ntp test -f "$SCRIPT_SOURCE_DIR"/../pom.xml -Dcucumber.options="--plugin junit:target/junit-report.xml"
TEST_EXIT_CODE=$?
#### COPY TEST REPORTS #########################################################################
--
GitLab