Merge main to branch

cherylking · Aug 10, 2023 · 426235f · 426235f
2 parents a01559d + f6dbbea
commit 426235f
Show file tree

Hide file tree

Showing 137 changed files with 831 additions and 430 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -22,13 +22,13 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [22.0.0.12, 23.0.0.3]
+        RUNTIME_VERSION: [23.0.0.6, 23.0.0.3]
         java: [17, 11, 8]
         exclude:
         - java: 8
-          RUNTIME_VERSION: 22.0.0.12
+          RUNTIME_VERSION: 23.0.0.3
         - java: 17
-          RUNTIME_VERSION: 22.0.0.12
+          RUNTIME_VERSION: 23.0.0.3
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Linux
     steps:
     # Checkout repos
@@ -51,6 +51,10 @@ jobs:
       with:
         repository: OpenLiberty/ci.ant
         path: ci.ant
+    - name: Set up Maven
+      uses: stCarolas/[email protected]
+      with:
+        maven-version: 3.9.2
     - name: Cache maven packages
       uses: actions/cache@v3
       with:
@@ -60,14 +64,11 @@ jobs:
     # Install dependencies
     - name: Install ci.ant and ci.common
       run: |
-        cd ./ci.ant
-        mvn clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
-        cd ../ci.common
-        mvn clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
-        cd ..
+        ./mvnw -V clean install -f ci.ant --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
+        ./mvnw -V clean install -f ci.common --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
     # Run tests
     - name: Run tests
-      run: ./mvnw verify --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -Ponline-its -D"invoker.streamLogs"=true -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
+      run: ./mvnw -V verify --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -Ponline-its -D"invoker.streamLogs"=true -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
 
 # WINDOWS BUILD
   build-windows:
@@ -77,13 +78,13 @@ jobs:
       matrix:
         # test against latest update of each major Java version, as well as specific updates of LTS versions:
         RUNTIME: [ol, wlp]
-        RUNTIME_VERSION: [22.0.0.12, 23.0.0.3]
+        RUNTIME_VERSION: [23.0.0.6, 23.0.0.3]
         java: [17, 11, 8]
         exclude:
         - java: 8
-          RUNTIME_VERSION: 22.0.0.12
+          RUNTIME_VERSION: 23.0.0.3
         - java: 17
-          RUNTIME_VERSION: 22.0.0.12
+          RUNTIME_VERSION: 23.0.0.3
     name: ${{ matrix.RUNTIME }} ${{ matrix.RUNTIME_VERSION }}, Java ${{ matrix.java }}, Windows
     steps:    
     # Checkout repos
@@ -107,14 +108,19 @@ jobs:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
-    # Install dependencies
-    - name: Install ci.ant and ci.common
-      run: |
-        cd C:/ci.ant
-        mvn clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
-        cd C:/ci.common
-        mvn clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
+    - name: Set up Maven
+      uses: stCarolas/[email protected]
+      with:
+        maven-version: 3.9.2
+    # Install ci.ant
+    - name: Install ci.ant
+      working-directory: C:/ci.ant
+      run: .\mvnw.cmd -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
+    # Install ci.common
+    - name: Install ci.common
+      working-directory: C:/ci.common
+      run: .\mvnw.cmd -V clean install --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false
     # Run tests
     - name: Run tests
       working-directory: C:/ci.maven
-      run: .\mvnw.cmd verify -Ponline-its --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -D"invoker.streamLogs"=true -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
+      run: .\mvnw.cmd -V verify -Ponline-its --batch-mode --no-transfer-progress --errors -DtrimStackTrace=false -D"invoker.streamLogs"=true -Druntime=${{ matrix.RUNTIME }} -DruntimeVersion="${{ matrix.RUNTIME_VERSION }}"
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -6,13 +6,13 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#   https://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ To enable Liberty Maven Plugin in your project add the following to your `pom.xm
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.1</version>
                 <!-- Specify configuration, executions for liberty-maven-plugin -->
                 ...
             </plugin>
@@ -104,7 +104,7 @@ Example using the `runtimeArtifact` parameter to install a WebSphere Liberty run
 <plugin>
     <groupId>io.openliberty.tools</groupId>
     <artifactId>liberty-maven-plugin</artifactId>
-    <version>3.7.1</version>
+    <version>3.8.1</version>
     <configuration>
         <runtimeArtifact>
             <groupId>com.ibm.websphere.appserver.runtime</groupId>
@@ -124,7 +124,7 @@ Example using the `runtimeArtifact` parameter to install an Open Liberty beta ru
 <plugin>
     <groupId>io.openliberty.tools</groupId>
     <artifactId>liberty-maven-plugin</artifactId>
-    <version>3.7.1</version>
+    <version>3.8.1</version>
     <configuration>
         <runtimeArtifact>
             <groupId>io.openliberty.beta</groupId>
@@ -238,7 +238,7 @@ Example:
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>[3.2.3,)</version>
+                <version>[3.8.1,)</version>
                 <extensions>true</extensions>
                 <configuration>
                     <installDirectory>/opt/ibm/wlp</installDirectory>

diff --git a/docs/common-server-parameters.md b/docs/common-server-parameters.md
@@ -170,3 +170,9 @@ Example of Liberty configuration with parameters:
     </executions>
 </plugin>
 ```
+
+#### Late property replacement
+
+Maven does property replacement for `${...}` values in pom.xml before any plugin is run. Starting with the 3.8.3 release of the liberty-maven-plugin, an alternate syntax `@{...}` is supported which allows late replacement of properties when the plugin is executed. This enables properties that are modified by other plugins to be picked up correctly.
+
+The alternate syntax is supported for Liberty configuration specified by Maven properties, as well as the `jvmOptions` and `bootstrapProperties` parameters.
diff --git a/liberty-maven-app-parent/pom.xml b/liberty-maven-app-parent/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.openliberty.tools</groupId>
         <artifactId>liberty-maven</artifactId>
-        <version>3.9-SNAPSHOT</version>
+        <version>3.8.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>liberty-maven-app-parent</artifactId>
@@ -44,7 +44,7 @@
                 <plugin>
                     <groupId>io.openliberty.tools</groupId>
                     <artifactId>liberty-maven-plugin</artifactId>
-                    <version>3.9-SNAPSHOT</version>
+                    <version>3.8.3-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <id>stop-before-clean</id>

diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
@@ -6,14 +6,18 @@
     <parent>
         <groupId>io.openliberty.tools</groupId>
         <artifactId>liberty-maven</artifactId>
-        <version>3.9-SNAPSHOT</version>
+        <version>3.8.3-SNAPSHOT</version>
     </parent>
 
     <artifactId>liberty-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>liberty-maven-plugin</name>
     <description>Liberty Maven Plugin : Install, Start/Stop, Package, Create Server, Deploy/Undeploy applications</description>
 
+    <prerequisites>
+        <maven>${maven.version}</maven>
+    </prerequisites>
+
     <repositories>
         <!-- Configure Sonatype OSS Maven snapshots repository -->
         <repository>
@@ -33,14 +37,32 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>liberty-ant-tasks</artifactId>
-            <version>1.9.12</version>
+            <version>1.9.13-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
             <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>${maven.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-mapping</artifactId>
@@ -50,23 +72,23 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.8.1</version>
+            <version>${maven.plugin.tools.version}</version>
             <scope>provided</scope>            <!-- annotations are needed only to build the plugin -->
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>3.4.2</version>
+            <version>3.5.1</version>
         </dependency>
         <dependency>
-            <groupId>org.sonatype.plexus</groupId>
+            <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-build-api</artifactId>
-            <version>0.0.7</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>ci.common</artifactId>
-            <version>1.8.25-SNAPSHOT</version>
+            <version>1.8.27-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.twdata.maven</groupId>
@@ -85,16 +107,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>${maven.plugin.tools.version}</version>
                 <executions>
                     <execution>
                         <id>help-goal</id>
                         <goals>
                             <goal>helpmojo</goal>
                         </goals>
-                        <configuration>
-                            <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -109,7 +128,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-invoker-plugin</artifactId>
-                        <version>3.3.0</version>
                         <configuration>
                             <debug>false</debug>
                             <goals>
@@ -145,7 +163,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-invoker-plugin</artifactId>
-                        <version>3.3.0</version>
                         <configuration>
                             <debug>false</debug>
                             <goals>
@@ -334,8 +351,4 @@
             </build>
         </profile>
     </profiles>
-
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
 </project>
diff --git a/liberty-maven-plugin/src/it/alt-outputdir-it/pom.xml b/liberty-maven-plugin/src/it/alt-outputdir-it/pom.xml
@@ -50,7 +50,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <packagingExcludes>pom.xml</packagingExcludes>

diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-it/pom.xml
@@ -51,17 +51,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.1.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.1.2</version>
             </plugin>
         </plugins>
     </pluginManagement>
@@ -122,6 +122,7 @@
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
                     <cleanLogs>false</cleanLogs>
+                    <cleanWorkarea>false</cleanWorkarea>
                 </configuration>
             </execution>
          </executions>

diff --git a/...maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/pom.xml b/...maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-default-recursive-it/pom.xml
@@ -45,17 +45,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.1.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.1.2</version>
             </plugin>
         </plugins>
     </pluginManagement>
@@ -115,6 +115,7 @@
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
                     <cleanLogs>false</cleanLogs>
+                    <cleanWorkarea>false</cleanWorkarea>
                 </configuration>
             </execution>
          </executions>

diff --git a/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/pom.xml b/liberty-maven-plugin/src/it/appsdirectory-apps-configured-bootstraps-it/pom.xml
@@ -45,17 +45,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.1.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.1.2</version>
             </plugin>
         </plugins>
     </pluginManagement>
@@ -124,6 +124,7 @@
                     <cleanDropins>true</cleanDropins>
                     <cleanApps>true</cleanApps>
                     <cleanLogs>false</cleanLogs>
+                    <cleanWorkarea>false</cleanWorkarea>
                 </configuration>
             </execution>
          </executions>