Skip to content

Commit ffd30a3

Browse files
authored
[MNG-8727] Prepare for Java 24 (#2328)
Simple changes that makes build/ITs work with Java 24. PR does not contains: * action addition of Java 24 to CI * updated Eclipse Sisu version (needed for that above) --- https://issues.apache.org/jira/browse/MNG-8727
1 parent 0a6cb9a commit ffd30a3

File tree

5 files changed

+47
-3
lines changed
  • impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal
  • its/core-it-suite/src/test/resources

5 files changed

+47
-3
lines changed

impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private String validateOutput(boolean shave, ByteArrayOutputStream stdout, ByteA
142142
}
143143
// sanity checks: stderr has any OR result is empty string (no method should emit empty string)
144144
if (stderr.size() > 0 || result.trim().isEmpty()) {
145-
throw new ExecutorException(
145+
System.err.println(
146146
"Unexpected stdout[" + stdout.size() + "]=" + stdout + "; stderr[" + stderr.size() + "]=" + stderr);
147147
}
148148
return result;

its/core-it-suite/src/test/resources/mng-7045/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ javax.enterprise.inject.Instance.class.getDeclaredMethod("stream")]]></script>
4343
<dependency>
4444
<groupId>org.apache.groovy</groupId>
4545
<artifactId>groovy-ant</artifactId>
46-
<version>4.0.15</version>
46+
<version>4.0.26</version>
4747
<scope>runtime</scope>
4848
</dependency>
4949
<dependency>
5050
<groupId>org.apache.groovy</groupId>
5151
<artifactId>groovy</artifactId>
52-
<version>4.0.15</version>
52+
<version>4.0.26</version>
5353
<scope>runtime</scope>
5454
</dependency>
5555
</dependencies>

its/core-it-suite/src/test/resources/mng-7160-extensionclassloader/extension/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,23 @@ under the License.
3838
</dependency>
3939
</dependencies>
4040

41+
<build>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.eclipse.sisu</groupId>
45+
<artifactId>sisu-maven-plugin</artifactId>
46+
<version>0.9.0.M3</version>
47+
<executions>
48+
<execution>
49+
<id>index-project</id>
50+
<goals>
51+
<goal>main-index</goal>
52+
<goal>test-index</goal>
53+
</goals>
54+
</execution>
55+
</executions>
56+
</plugin>
57+
</plugins>
58+
</build>
59+
4160
</project>

its/core-it-suite/src/test/resources/mng-7587-jsr330/plugin/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,20 @@
7272
<release>17</release>
7373
</configuration>
7474
</plugin>
75+
<plugin>
76+
<groupId>org.eclipse.sisu</groupId>
77+
<artifactId>sisu-maven-plugin</artifactId>
78+
<version>0.9.0.M3</version>
79+
<executions>
80+
<execution>
81+
<id>index-project</id>
82+
<goals>
83+
<goal>main-index</goal>
84+
<goal>test-index</goal>
85+
</goals>
86+
</execution>
87+
</executions>
88+
</plugin>
7589
<plugin>
7690
<groupId>org.apache.maven.plugins</groupId>
7791
<artifactId>maven-plugin-plugin</artifactId>

pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,17 @@ under the License.</licenseText>
796796
</excludes>
797797
</configuration>
798798
</plugin>
799+
<plugin>
800+
<groupId>org.apache.maven.plugins</groupId>
801+
<artifactId>maven-pmd-plugin</artifactId>
802+
<dependencies>
803+
<dependency>
804+
<groupId>net.sourceforge.pmd</groupId>
805+
<artifactId>pmd-core</artifactId>
806+
<version>7.12.0</version>
807+
</dependency>
808+
</dependencies>
809+
</plugin>
799810
</plugins>
800811
</pluginManagement>
801812
<plugins>

0 commit comments

Comments
 (0)