From 7a2c5e015fcc78044f73518978cb5d0cd7389517 Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Fri, 16 Jun 2023 16:55:15 -0500
Subject: [PATCH] Update several plugin versions

---
 liberty-maven-plugin/pom.xml                   |  2 +-
 .../src/it/ear-project-it/AppXmlEAR/pom.xml    |  2 +-
 .../SampleEAR-classifier-app/pom.xml           | 11 +++++++++++
 .../SampleEJB-classifier-dep/pom.xml           | 11 +++++++++++
 .../src/it/ear-project-it/pom.xml              | 10 +++++-----
 .../it/ear-project-it/skinnywar-ear/pom.xml    | 18 +++++++++++++++++-
 pom.xml                                        |  2 +-
 7 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
index 37144e519..298f7c3ab 100644
--- a/liberty-maven-plugin/pom.xml
+++ b/liberty-maven-plugin/pom.xml
@@ -85,7 +85,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.9.0</version>
                 <executions>
                     <execution>
                         <id>help-goal</id>
diff --git a/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/pom.xml
index fb32bd47b..1535b0661 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/AppXmlEAR/pom.xml
@@ -53,7 +53,7 @@
                         libraries are in easy way to package any libraries needed in the ear, and 
                         automatically have any modules (EJB-JARs and WARs) use them -->
                     <defaultLibBundleDir>lib</defaultLibBundleDir>
-                    <fileNameMapping>no-version</fileNameMapping>
+                    <!--outputFileNameMapping>@{artifactId}@.@{extension}@</outputFileNameMapping-->
                     <applicationXml>${project.basedir}/src/main/application/META-INF/application.xml</applicationXml>
                 </configuration>
             </plugin>
diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR-classifier-app/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR-classifier-app/pom.xml
index 49df890f9..e1433de77 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/SampleEAR-classifier-app/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/SampleEAR-classifier-app/pom.xml
@@ -65,6 +65,17 @@
                     </modules>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <id>default-install</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
diff --git a/liberty-maven-plugin/src/it/ear-project-it/SampleEJB-classifier-dep/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/SampleEJB-classifier-dep/pom.xml
index 68c393301..e6c7c10e4 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/SampleEJB-classifier-dep/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/SampleEJB-classifier-dep/pom.xml
@@ -38,6 +38,17 @@
                     <classifier>the-ejb</classifier>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <id>default-install</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/liberty-maven-plugin/src/it/ear-project-it/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/pom.xml
index fa703d18f..41ca4ac91 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/pom.xml
@@ -63,27 +63,27 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.4.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ejb-plugin</artifactId>
-                    <version>2.5.1</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
-                    <version>2.10.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-rar-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.1</version>
+                    <version>3.10.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>
diff --git a/liberty-maven-plugin/src/it/ear-project-it/skinnywar-ear/pom.xml b/liberty-maven-plugin/src/it/ear-project-it/skinnywar-ear/pom.xml
index 8af1fd2a9..ffc477d25 100644
--- a/liberty-maven-plugin/src/it/ear-project-it/skinnywar-ear/pom.xml
+++ b/liberty-maven-plugin/src/it/ear-project-it/skinnywar-ear/pom.xml
@@ -53,9 +53,25 @@
                 <version>2.10.1</version>
                 <configuration>
                     <version>7</version>
-                    <fileNameMapping>no-version</fileNameMapping>
                     <defaultLibBundleDir>lib</defaultLibBundleDir>
                     <skinnyWars>true</skinnyWars>
+                    <modules>
+                        <webModule>
+                            <groupId>io.openliberty.tools.it</groupId>
+                            <artifactId>SampleWAR</artifactId>
+                            <bundleFileName>SampleWAR.war</bundleFileName>
+                        </webModule>
+                        <ejbModule>
+                            <groupId>io.openliberty.tools.it</groupId>
+                            <artifactId>SampleEJB</artifactId>
+                            <bundleFileName>SampleEJB.jar</bundleFileName>
+                        </ejbModule>
+                        <jarModule>
+                            <groupId>commons-io</groupId>
+                            <artifactId>commons-io</artifactId>
+                            <bundleFileName>commons-io.jar</bundleFileName>   
+                        </jarModule>
+                    </modules>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 6a50be23f..f45061a98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>animal-sniffer-maven-plugin</artifactId>
-                        <version>1.22</version>
+                        <version>1.23</version>
                         <configuration>
                             <signature>
                                 <groupId>org.codehaus.mojo.signature</groupId>