Skip to content

Commit ef25976

Browse files
[MNG-8728] Build ITs on JDK 21, 24
1 parent 9090adf commit ef25976

File tree

21 files changed

+43
-24
lines changed
  • .github/workflows
  • core-it-suite/src/test
    • resources
      • mng-5382
      • mng-5389-lifecycleParticipant-afterSession/extension
      • mng-5530-mojo-execution-scope
      • mng-5578-session-scope
      • mng-5581-lifecycle-mapping-delegate/extension
      • mng-5591-workspace-reader/extension
      • mng-5640-lifecycleParticipant-afterSession/extension
      • mng-5742-build-extension-classloader/plugin
      • mng-6084-jsr250-support
      • mng-7045
      • mng-7160-extensionclassloader/extension
      • mng-7310-lifecycle-activated-in-specified-module/extension
      • mng-7474-session-scope/plugin
      • mng-7836-alternative-pom-syntax/maven-hocon-extension
      • mng-7891-extension-configuration/extension
    • resources-filtered

21 files changed

+43
-24
lines changed

.github/workflows/maven-verify.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
strategy:
3232
matrix:
3333
os: [ubuntu-latest]
34-
java: [8, 11, 17]
34+
java: [8, 11, 17, 21, 24]
3535
fail-fast: false
3636

3737
runs-on: ${{ matrix.os }}
@@ -49,7 +49,7 @@ jobs:
4949
cache: 'maven'
5050

5151
- name: Set up Maven
52-
run: mvn --errors --batch-mode --show-version wrapper:wrapper "-Dtype=only-script" "-Dmaven=3.9.7"
52+
run: mvn --errors --batch-mode --show-version wrapper:wrapper "-Dtype=only-script" "-Dmaven=3.9.9"
5353

5454
- name: Running integration tests
5555
run: "./mvnw -B clean install -Prun-its,embedded -Dmaven.repo.local=`pwd`/repo"

core-it-suite/src/test/resources-filtered/bootstrap.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ junit:junit:4.12
1717
org.apache.ant:ant:1.10.8
1818
org.apache.commons:commons-text:1.10.0
1919
org.apache.geronimo.specs:geronimo-jcdi_2.0_spec:1.3
20-
org.apache.groovy:groovy-ant:4.0.15
21-
org.apache.groovy:groovy:4.0.15
20+
org.apache.groovy:groovy-ant:4.0.26
21+
org.apache.groovy:groovy:4.0.26
2222
org.apache.maven.extensions:maven-extensions:40:pom
2323
org.apache.maven.its.plugins.class-loader:dep-c:${project.version}
2424
org.apache.maven.its.plugins:maven-it-plugin-active-collection:${project.version}
@@ -166,7 +166,7 @@ org.eclipse.aether:aether-impl:0.9.0.M2
166166
org.eclipse.aether:aether-spi:0.9.0.M2
167167
org.eclipse.sisu:org.eclipse.sisu.inject:0.0.0.M5
168168
org.eclipse.sisu:org.eclipse.sisu.plexus:0.0.0.M5
169-
org.eclipse.sisu:sisu-maven-plugin:0.3.5
169+
org.eclipse.sisu:sisu-maven-plugin:0.9.0.M4
170170
org.junit:junit-bom:5.9.1:pom
171171
org.junit.jupiter:junit-jupiter:5.9.1
172172
org.junit.jupiter:junit-jupiter-engine:5.9.1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<plugin>
6363
<groupId>org.eclipse.sisu</groupId>
6464
<artifactId>sisu-maven-plugin</artifactId>
65-
<version>0.3.5</version>
65+
<version>0.9.0.M4</version>
6666
<executions>
6767
<execution>
6868
<id>generate-index</id>

core-it-suite/src/test/resources/mng-5389-lifecycleParticipant-afterSession/extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
<plugin>
4343
<groupId>org.eclipse.sisu</groupId>
4444
<artifactId>sisu-maven-plugin</artifactId>
45-
<version>0.3.5</version>
45+
<version>0.9.0.M4</version>
4646
<executions>
4747
<execution>
4848
<goals>

core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ under the License.
8080
<plugin>
8181
<groupId>org.eclipse.sisu</groupId>
8282
<artifactId>sisu-maven-plugin</artifactId>
83-
<version>0.3.5</version>
83+
<version>0.9.0.M4</version>
8484
<executions>
8585
<execution>
8686
<goals>

core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
<plugin>
4343
<groupId>org.eclipse.sisu</groupId>
4444
<artifactId>sisu-maven-plugin</artifactId>
45-
<version>0.3.5</version>
45+
<version>0.9.0.M4</version>
4646
<executions>
4747
<execution>
4848
<goals>

core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ under the License.
7373
<plugin>
7474
<groupId>org.eclipse.sisu</groupId>
7575
<artifactId>sisu-maven-plugin</artifactId>
76-
<version>0.3.5</version>
76+
<version>0.9.0.M4</version>
7777
<executions>
7878
<execution>
7979
<goals>

core-it-suite/src/test/resources/mng-5578-session-scope/extension-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ under the License.
8080
<plugin>
8181
<groupId>org.eclipse.sisu</groupId>
8282
<artifactId>sisu-maven-plugin</artifactId>
83-
<version>0.3.5</version>
83+
<version>0.9.0.M4</version>
8484
<executions>
8585
<execution>
8686
<goals>

core-it-suite/src/test/resources/mng-5578-session-scope/extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
<plugin>
4343
<groupId>org.eclipse.sisu</groupId>
4444
<artifactId>sisu-maven-plugin</artifactId>
45-
<version>0.3.5</version>
45+
<version>0.9.0.M4</version>
4646
<executions>
4747
<execution>
4848
<goals>

core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ under the License.
7373
<plugin>
7474
<groupId>org.eclipse.sisu</groupId>
7575
<artifactId>sisu-maven-plugin</artifactId>
76-
<version>0.3.5</version>
76+
<version>0.9.0.M4</version>
7777
<executions>
7878
<execution>
7979
<goals>

core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
<plugin>
4343
<groupId>org.eclipse.sisu</groupId>
4444
<artifactId>sisu-maven-plugin</artifactId>
45-
<version>0.3.5</version>
45+
<version>0.9.0.M4</version>
4646
<executions>
4747
<execution>
4848
<id>generate-index</id>

core-it-suite/src/test/resources/mng-5591-workspace-reader/extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
<plugin>
4343
<groupId>org.eclipse.sisu</groupId>
4444
<artifactId>sisu-maven-plugin</artifactId>
45-
<version>0.3.5</version>
45+
<version>0.9.0.M4</version>
4646
<executions>
4747
<execution>
4848
<id>generate-index</id>

core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ under the License.
4242
<plugin>
4343
<groupId>org.eclipse.sisu</groupId>
4444
<artifactId>sisu-maven-plugin</artifactId>
45-
<version>0.3.5</version>
45+
<version>0.9.0.M4</version>
4646
<executions>
4747
<execution>
4848
<goals>

core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ under the License.
7373
<plugin>
7474
<groupId>org.eclipse.sisu</groupId>
7575
<artifactId>sisu-maven-plugin</artifactId>
76-
<version>0.3.5</version>
76+
<version>0.9.0.M4</version>
7777
<executions>
7878
<execution>
7979
<goals>

core-it-suite/src/test/resources/mng-6084-jsr250-support/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<plugin>
6868
<groupId>org.eclipse.sisu</groupId>
6969
<artifactId>sisu-maven-plugin</artifactId>
70-
<version>0.3.5</version>
70+
<version>0.9.0.M4</version>
7171
<executions>
7272
<execution>
7373
<id>generate-index</id>

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>

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.M4</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>

core-it-suite/src/test/resources/mng-7310-lifecycle-activated-in-specified-module/extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ under the License.
5151
<plugin>
5252
<groupId>org.eclipse.sisu</groupId>
5353
<artifactId>sisu-maven-plugin</artifactId>
54-
<version>0.3.5</version>
54+
<version>0.9.0.M4</version>
5555
<executions>
5656
<execution>
5757
<id>generate-index</id>

core-it-suite/src/test/resources/mng-7474-session-scope/plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<plugin>
5757
<groupId>org.eclipse.sisu</groupId>
5858
<artifactId>sisu-maven-plugin</artifactId>
59-
<version>0.3.5</version>
59+
<version>0.9.0.M4</version>
6060
<executions>
6161
<execution>
6262
<id>generate-index</id>

core-it-suite/src/test/resources/mng-7836-alternative-pom-syntax/maven-hocon-extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ under the License.
122122
<plugin>
123123
<groupId>org.eclipse.sisu</groupId>
124124
<artifactId>sisu-maven-plugin</artifactId>
125-
<version>0.3.5</version>
125+
<version>0.9.0.M4</version>
126126
<executions>
127127
<execution>
128128
<id>index-project</id>

core-it-suite/src/test/resources/mng-7891-extension-configuration/extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<plugin>
2727
<groupId>org.eclipse.sisu</groupId>
2828
<artifactId>sisu-maven-plugin</artifactId>
29-
<version>0.3.5</version>
29+
<version>0.9.0.M4</version>
3030
<executions>
3131
<execution>
3232
<id>index-project</id>

0 commit comments

Comments
 (0)