diff --git a/finish/ear/pom.xml b/finish/ear/pom.xml index 7911cbd..2a3e43f 100644 --- a/finish/ear/pom.xml +++ b/finish/ear/pom.xml @@ -50,7 +50,7 @@ org.junit.jupiter junit-jupiter - 5.7.1 + 5.6.2 test @@ -62,7 +62,7 @@ org.apache.maven.plugins maven-ear-plugin - 3.2.0 + 3.0.2 @@ -93,7 +93,7 @@ io.openliberty.tools liberty-maven-plugin - 3.3.4 + 3.2.3 diff --git a/finish/war/pom.xml b/finish/war/pom.xml index ac0d41e..aa97af1 100644 --- a/finish/war/pom.xml +++ b/finish/war/pom.xml @@ -38,7 +38,7 @@ org.eclipse.microprofile microprofile - 4.0.1 + 3.3 pom provided diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh index 3ace57a..7bbfb10 100755 --- a/scripts/dailyBuild.sh +++ b/scripts/dailyBuild.sh @@ -1,13 +1,14 @@ #!/bin/bash -while getopts t:d: flag; do +while getopts t:d:b:u: flag; do case "${flag}" in t) DATE="${OPTARG}" ;; d) DRIVER="${OPTARG}" ;; - *) echo "Invalid option";; + b) BUILD="${OPTARG}" ;; + u) DOCKER_USERNAME="${OPTARG}" ;; esac done -sed -i "\#liberty-maven-plugin#ahttps://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER" ear/pom.xml +sed -i "\#liberty-maven-plugin#ahttps://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/"$DATE"/"$DRIVER"" ear/pom.xml cat ear/pom.xml ../scripts/testApp.sh diff --git a/scripts/testApp.sh b/scripts/testApp.sh index 7aaf6d9..b2f39f2 100755 --- a/scripts/testApp.sh +++ b/scripts/testApp.sh @@ -14,16 +14,10 @@ set -euxo pipefail # liberty:create - Create a Liberty server. # liberty:install-feature - Install a feature packaged as a Subsystem Archive (esa) to the Liberty runtime. # liberty:deploy - Copy applications to the Liberty server's dropins or apps directory. -mvn -Dhttp.keepAlive=false \ - -Dmaven.wagon.http.pool=false \ - -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \ - -q clean install +mvn -q clean install cd ear -mvn -Dhttp.keepAlive=false \ - -Dmaven.wagon.http.pool=false \ - -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \ - liberty:create liberty:install-feature liberty:deploy +mvn liberty:create liberty:install-feature liberty:deploy ## Run the tests # These commands are separated because if one of the commands fail, the test script will fail and exit. diff --git a/start/ear/pom.xml b/start/ear/pom.xml index 5268679..3ba43a8 100644 --- a/start/ear/pom.xml +++ b/start/ear/pom.xml @@ -31,7 +31,7 @@ org.junit.jupiter junit-jupiter - 5.7.1 + 5.6.2 test @@ -47,7 +47,7 @@ io.openliberty.tools liberty-maven-plugin - 3.3.4 + 3.2.3