Skip to content

WELD-2820 - JDK 25 readiness #3246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manovotn merged 3 commits into from
Nov 7, 2025
Merged

WELD-2820 - JDK 25 readiness #3246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96c5d78
WELD-2820 Explicitly enable annotation processors for compiler plugin…
manovotn Nov 5, 2025
6d0fc5a
WELD-2820 Add JDK 25 to the CI
manovotn Nov 5, 2025
0dad81d
WELD-2820 Upgrade Groovy version
manovotn Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/workflows/ci-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ jobs:
name: "21",
java-version: 21,
}
- {
name: "25",
java-version: 25,
}
steps:
- uses: actions/checkout@v5
- name: Set up JDK ${{ matrix.java.name }}
Expand Down Expand Up @@ -162,6 +166,10 @@ jobs:
name: "21",
java-version: 21,
}
- {
name: "25",
java-version: 25,
}
steps:
- uses: actions/checkout@v5
- name: Set up JDK ${{ matrix.java.name }}
Expand Down Expand Up @@ -300,6 +308,10 @@ jobs:
name: "21",
java-version: 21,
}
- {
name: "25",
java-version: 25,
}
steps:
- uses: actions/checkout@v5
- name: Set up JDK ${{ matrix.java.name }}
Expand Down Expand Up @@ -409,6 +421,10 @@ jobs:
name: "21",
java-version: 21,
}
- {
name: "25",
java-version: 25,
}
steps:
- uses: actions/checkout@v5
- name: Set up JDK ${{ matrix.java.name }}
Expand Down
12 changes: 5 additions & 7 deletions environments/se/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,18 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<optional>true</optional>
<type>pom</type>
<exclusions>
<!-- Exclude these otherwise surefire doesn't find any tests to run -->
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-test-junit5</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-testng</artifactId>
</exclusion>
</exclusions>
Expand Down Expand Up @@ -149,6 +149,8 @@
</execution>
</executions>
<configuration>
<!-- IIUIC, this should be the same as what we compile Weld into -->
<targetBytecode>${maven.compiler.argument.target}</targetBytecode>
<testSources>
<testSource>
<directory>${project.basedir}/src/test/groovy</directory>
Expand All @@ -169,10 +171,6 @@
<goals>
<goal>compile</goal>
</goals>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</execution>
</executions>
</plugin>
Expand Down
3 changes: 2 additions & 1 deletion examples/se/groovy-numberguess/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -72,6 +72,7 @@
</execution>
</executions>
<configuration>
<targetBytecode>${maven.compiler.argument.target}</targetBytecode>
<sources>
<source>
<directory>${project.basedir}/src/main/java</directory>
Expand Down
8 changes: 5 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<!-- Our variant is under src/test/tck/tck-tests.xml -->
<cdi.tck.suite.xml.file />
<classfilewriter.version>1.3.1.Final</classfilewriter.version>
<groovy.version>3.0.25</groovy.version>
<groovy.version>5.0.2</groovy.version>
<htmlunit.version>2.70.0</htmlunit.version>
<jacoco.version>0.8.13</jacoco.version>
<jandex.version>3.5.0</jandex.version>
Expand Down Expand Up @@ -118,7 +118,7 @@
</dependency>

<dependency>
<groupId>org.codehaus.groovy</groupId>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<type>pom</type>
Expand Down Expand Up @@ -474,7 +474,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<compilerArgs>
<arg>-Aorg.jboss.logging.tools.addGeneratedAnnotation=false</arg>
<!-- Needed since Java 23 to enable annotation processors (JBoss Logging) -->
<!-- 'full' means that annotation processing happens alongside source code compilation -->
<arg>-proc:full</arg>
</compilerArgs>
</configuration>
</plugin>
Expand Down
Loading