Revert "Merge staging to prod - Version update (#89)"

OpenLiberty · Jun 4, 2021 · eecf5f4 · eecf5f4
1 parent 99b65fb
commit eecf5f4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/finish/ear/pom.xml b/finish/ear/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.7.1</version>
+            <version>5.6.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.0.2</version>
                 <configuration>
                     <modules>
                         <!-- tag::jarModule[] -->
@@ -93,7 +93,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.2.3</version>
             </plugin>
             <!-- end::liberty-maven-plugin[] -->
 

diff --git a/finish/war/pom.xml b/finish/war/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>4.0.1</version>
+            <version>3.3</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>

diff --git 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 "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER</runtimeUrl></install></configuration>" ear/pom.xml
+sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/"$DATE"/"$DRIVER"</runtimeUrl></install></configuration>" ear/pom.xml
 cat ear/pom.xml
 
 ../scripts/testApp.sh
diff --git 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
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.7.1</version>
+            <version>5.6.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -47,7 +47,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
+                <version>3.2.3</version>
             </plugin>
 
             <!-- Since the package type is ear,

diff --git a/start/war/pom.xml b/start/war/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.eclipse.microprofile</groupId>
             <artifactId>microprofile</artifactId>
-            <version>4.0.1</version>
+            <version>3.3</version>
             <type>pom</type>
             <scope>provided</scope>
         </dependency>