Issue 857: add maven settings.xml and update liberty version (#858)

* Issue 857: add maven settings.xml and update liberty version

* Issue 857: Add maven settings.xml

incubator/java-openliberty/README.md

@@ -4,7 +4,7 @@ The Open Liberty stack provides a consistent way of developing microservices bas
 
 The Open Liberty stack uses a parent Maven project object model (POM) to manage dependency versions and provide required capabilities and plugins.
 
-This stack is based on OpenJDK with container-optimizations in OpenJ9 and `Open Liberty v20.0.0.6`. It provides live reloading during development by utilizing the "dev mode" capability in the liberty-maven-plugin. To see dev mode in action (though not in Appsody) check out this [shorter demo](https://openliberty.io/blog/2019/10/22/liberty-dev-mode.html) and this [a bit longer demo](https://blog.sebastian-daschner.com/entries/openliberty-plugin-dev-mode).
+This stack is based on OpenJDK with container-optimizations in OpenJ9 and `Open Liberty v20.0.0.9`. It provides live reloading during development by utilizing the "dev mode" capability in the liberty-maven-plugin. To see dev mode in action (though not in Appsody) check out this [shorter demo](https://openliberty.io/blog/2019/10/22/liberty-dev-mode.html) and this [a bit longer demo](https://blog.sebastian-daschner.com/entries/openliberty-plugin-dev-mode).
 
 **Note:** Maven is provided by the Appsody stack container, allowing you to build, test, and debug your Java application without installing Maven locally. However, we recommend installing Maven locally for the best IDE experience.
 

incubator/java-openliberty/image/Dockerfile-stack

@@ -17,6 +17,8 @@ RUN groupadd --gid 1000 java_group \
 COPY ./LICENSE /licenses/
 COPY --chown=java_user:java_group ./project /project
 COPY --chown=java_user:java_group ./config /config
+COPY ./mvn-stack-settings.xml /usr/share/maven/conf/settings.xml
+
 
 USER java_user
 
@@ -27,8 +29,8 @@ WORKDIR /project/
 RUN mkdir -p /mvn/repository
 # Let's see the command we're hiding within the next line
 RUN mvn -e help:evaluate -Dexpression=maven.version -DforceStdout
-RUN mvn -B -Dmaven.repo.local=/mvn/repository -N io.takari:maven:wrapper -Dmaven=$(mvn help:evaluate -Dexpression=maven.version -q -DforceStdout)
-RUN mvn -B -Pstack-image-package -Dmaven.repo.local=/mvn/repository liberty:install-server install dependency:go-offline
+RUN mvn -B -N io.takari:maven:wrapper -Dmaven=$(mvn help:evaluate -Dexpression=maven.version -q -DforceStdout)
+RUN mvn -B -Pstack-image-package liberty:install-server install dependency:go-offline
 RUN chmod -R 777 /opt/ol && chmod -R 777 /mvn/repository
 
 

incubator/java-openliberty/image/mvn-stack-settings.xml

@@ -0,0 +1,15 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ https://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+ <!-- Use this file to customize maven repositories or other proxies that should be 
+ used when building projects: 
+ Defaults: https://maven.apache.org/settings.html
+ Reference: https://maven.apache.org/ref/3.6.1/maven-settings/settings.html
+ -->
+
+ <!-- Repository location in docker image -->
+ <localRepository>/mvn/repository</localRepository>
+
+</settings>

incubator/java-openliberty/stack.yaml

@@ -1,5 +1,5 @@
 name: Open Liberty
-version: 0.2.15
+version: 0.2.16
 description: Eclipse MicroProfile & Jakarta EE on Open Liberty & OpenJ9 using Maven
 license: Apache-2.0
 language: java
@@ -21,7 +21,7 @@ requirements:
  docker-version: ">= 17.09.0"
  appsody-version: ">= 0.5.0"
 templating-data:
- libertyversion: '20.0.0.6'
+ libertyversion: '20.0.0.9'
  parentpomgroup: 'dev.appsody'
  parentpomid: 'java-openliberty'
  parentpomrange: '[0.2, 0.3)'