diff --git a/README.adoc b/README.adoc index 3370e5e..3209e12 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -// Copyright (c) 2017, 2021 IBM Corporation and others. +// Copyright (c) 2017, 2020 IBM Corporation and others. // Licensed under Creative Commons Attribution-NoDerivatives // 4.0 International (CC BY-ND 4.0) // https://creativecommons.org/licenses/by-nd/4.0/ @@ -15,7 +15,7 @@ :page-essential-order: 3 :page-description: Learn how to build and test a simple web application using Maven and Open Liberty :page-related-guides: ['maven-multimodules', 'gradle-intro'] -:page-tags: ['Maven'] +:page-tags: ['Maven', 'Getting Started'] :page-permalink: /guides/{projectid} :common-includes: https://raw.githubusercontent.com/OpenLiberty/guides-common/master :page-seo-title: Building and testing a Java web application with Maven and Open Liberty @@ -244,7 +244,7 @@ include::finish/src/main/liberty/config/server.xml[] == Running the application [role='command'] -include::{common-includes}/devmode-lmp33-start.adoc[] +include::{common-includes}/devmode-start.adoc[] Navigate your browser to the http://localhost:9080/ServletSample/servlet[^] URL to access the application. The servlet returns a simple response of `Hello! How are you today?`. diff --git a/finish/pom.xml b/finish/pom.xml index fddff0e..32d6ef7 100644 --- a/finish/pom.xml +++ b/finish/pom.xml @@ -46,7 +46,7 @@ org.eclipse.microprofile microprofile - 4.0.1 + 3.3 pom provided @@ -65,7 +65,7 @@ org.junit.jupiter junit-jupiter - 5.7.1 + 5.6.2 test @@ -81,13 +81,13 @@ org.apache.maven.plugins maven-war-plugin - 3.3.1 + 3.2.3 io.openliberty.tools liberty-maven-plugin - 3.3.4 + 3.2.3 diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh index 196135d..86c29f6 100755 --- a/scripts/dailyBuild.sh +++ b/scripts/dailyBuild.sh @@ -1,14 +1,15 @@ #!/bin/bash -while getopts t:d: flag; +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#,\##cliberty-maven-plugin3.3.4https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER" pom.xml +sed -i "\#liberty-maven-plugin#,\##cliberty-maven-plugin3.2.3https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/"$DATE"/"$DRIVER"" pom.xml cat pom.xml ../scripts/testApp.sh diff --git a/scripts/testApp.sh b/scripts/testApp.sh index b1910d0..f755c2f 100755 --- a/scripts/testApp.sh +++ b/scripts/testApp.sh @@ -1,4 +1,3 @@ -#!/bin/bash set -euxo pipefail # LMP 3.0+ goals are listed here: https://github.com/OpenLiberty/ci.maven#goals @@ -8,10 +7,7 @@ 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 package liberty:create liberty:install-feature liberty:deploy +mvn -q clean package liberty:create liberty:install-feature liberty:deploy ## Run the tests