more workflow changes to use maven 3.9.9

Signed-off-by: Arun Venmany <[email protected]>
arunvenmany-ibm · Jan 16, 2025 · 32f40d7 · 32f40d7
1 parent 55d998d
commit 32f40d7
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 22 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -58,7 +58,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/[email protected]
       with:
-        maven-version: 3.9.2
+        maven-version: 3.9.9
     # Install dependencies
     - name: Install ci.ant and ci.common
       run: |
@@ -107,7 +107,7 @@ jobs:
     - name: Set up Maven
       uses: stCarolas/[email protected]
       with:
-        maven-version: 3.9.2
+        maven-version: 3.9.9
     # Install ci.ant
     - name: Install ci.ant
       working-directory: C:/ci.ant

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,5 @@
 # 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.9.2/apache-maven-3.9.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-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/liberty-maven-plugin/src/it/dev-it/pom.xml b/liberty-maven-plugin/src/it/dev-it/pom.xml
@@ -58,11 +58,8 @@
                     <argLine>-enableassertions</argLine>
                     <workingDirectory>${project.build.directory}</workingDirectory>
                     <includes>
-                        <include>**/*DevTest.java</include>
                         <include>**/*DevRecompileWithDefaultExecutionIdTest.java</include>
                         <include>**/*DevRecompileWithCustomExecutionIdTest.java</include>
-                        <include>**/*DevHotTestingTest.java</include>
-                        <include>**/*DevGenerateFeaturesDependenciesTest.java</include>
                     </includes>
                     <systemPropertyVariables>
                         <mavenPluginVersion>@pom.version@</mavenPluginVersion>

diff --git a/liberty-maven-plugin/src/it/dev-it/resources/basic-dev-project-umbrella-deps/pom.xml b/liberty-maven-plugin/src/it/dev-it/resources/basic-dev-project-umbrella-deps/pom.xml
@@ -92,17 +92,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>java-compile</id>
-            <phase>compile</phase>
-            <goals> <goal>compile</goal> </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>

diff --git a/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseDevTest.java b/liberty-maven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/BaseDevTest.java
@@ -152,7 +152,7 @@ protected static void setUpBeforeClass(String params, String projectRoot, boolea
    }
 
    protected static void startProcess(String params, boolean isDevMode) throws IOException, InterruptedException, FileNotFoundException {
-      startProcess(params, isDevMode, "mvn compile liberty:");
+      startProcess(params, isDevMode, "mvn liberty:");
    }
 
    protected static void startProcess(String params, boolean isDevMode, String mavenPluginCommand) throws IOException, InterruptedException, FileNotFoundException {

diff --git a/.../dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevGenerateFeaturesDependenciesTest.java b/.../dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevGenerateFeaturesDependenciesTest.java
@@ -42,8 +42,6 @@ public static void cleanUpAfterClass() throws Exception {
     @Test
     public void updateDependencyTest() throws Exception {
        assertTrue(verifyLogMessageExists("Liberty is running in dev mode.", 10000));
-       assertTrue(getLogTail(), verifyLogMessageExists("Running maven-compiler-plugin:compile#java-compile", 10000));
-       assertTrue(getLogTail(), verifyLogMessageExists("Nothing to compile - all classes are up to date.", 10000));
 
        File generatedFeaturesFile = getGeneratedFeaturesFile();
        File targetGeneratedFeaturesFile = getTargetGeneratedFeaturesFile();

diff --git a/...aven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevHotTestingTest.java b/...aven-plugin/src/it/dev-it/src/test/java/net/wasdev/wlp/test/dev/it/DevHotTestingTest.java
@@ -34,8 +34,6 @@ public static void cleanUpAfterClass() throws Exception {
 
    @Test
    public void autoTestsInvocationTest() throws Exception {
-      assertTrue(getLogTail(), verifyLogMessageExists("Running maven-compiler-plugin:compile#default-compile", 20000));
-      assertTrue(getLogTail(), verifyLogMessageExists("Nothing to compile - all classes are up to date.", 20000));
       assertTrue(verifyLogMessageExists("Tests will run automatically", 20000));
 
       testModifyJavaFile();