Skip to content

Commit 750d934

Browse files
Require JDK 17 for build (#327)
- reuse javaVersion property from parent - property maven.compiler.release is set by parent for JDK 11+ - reuse checking of bytecode version from parent
1 parent 3316707 commit 750d934

File tree

16 files changed

+13
-41
lines changed

16 files changed

+13
-41
lines changed

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: Build it
2525
uses: codehaus-plexus/.github/.github/workflows/maven.yml@master
2626
with:
27-
matrix-exclude: '[ {"jdk": "8"} ]'
27+
matrix-exclude: '[ {"jdk": "8"}, {"jdk": "11"} ]'
2828
jdk-distribution-matrix: '["zulu", "temurin", "microsoft", "liberica", "corretto"]'
2929
maven_args: 'verify javadoc:javadoc -e -B -V -fae'
3030

plexus-compiler-its/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<properties>
1717
<junit.version>4.13.2</junit.version>
18-
<maven.compiler.release>11</maven.compiler.release>
18+
<javaVersion>17</javaVersion>
1919
<maven.deploy.skip>true</maven.deploy.skip>
2020
</properties>
2121

plexus-compiler-its/src/main/it/MCOMPILER-346-mre/invoker.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 11+
1918
invoker.goals = clean compile
2019
invoker.buildResult = failure

plexus-compiler-its/src/main/it/aspectj-compiler/invoker.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 1.8+
1918
invoker.goals = clean test
2019
#invoker.buildResult = failure

plexus-compiler-its/src/main/it/eclipse-compiler-mapstruct/invoker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 1.8+
18+
invoker.maven.version = 3.9.6+
1919

2020
# without-dummy profile is used to have compiler plugin do actual compilation in the second run
2121
invoker.name.1 = Initial build

plexus-compiler-its/src/main/it/error-prone-compiler/invoker.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 1.8+
1918
invoker.goals = clean test-compile
2019
invoker.buildResult = failure

plexus-compiler-its/src/main/it/missing-warnings/invoker.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 11+
1918
invoker.goals = clean compile
2019
#invoker.buildResult = failure

plexus-compiler-its/src/main/it/simple-eclipse-compiler-fail/invoker.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 1.8+
1918
invoker.goals = clean test-compile
2019
invoker.buildResult = failure

plexus-compiler-its/src/main/it/simple-eclipse-compiler/invoker.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 1.8+
18+
invoker.maven.version = 3.9.6+
19+
1920
invoker.goals = clean test-compile
2021
#invoker.buildResult = failure

plexus-compiler-its/src/main/it/simple-javac-fork/invoker.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 1.8+
1918
invoker.goals = clean test-compile
2019
#invoker.buildResult = failure

plexus-compiler-its/src/main/it/simple-javac-fork/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<properties>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
35-
<maven.compiler.release>11</maven.compiler.release>
36-
<plexus.compiler.version>@pom.version@</plexus.compiler.version>
35+
<javaVersion>11</javaVersion>
36+
<plexus.compiler.version>@project.version@</plexus.compiler.version>
3737
</properties>
3838

3939
<dependencies>

plexus-compiler-its/src/main/it/simple-javac/invoker.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.java.version = 1.8+
1918
invoker.goals = clean test-compile
2019
#invoker.buildResult = failure

plexus-compilers/plexus-compiler-aspectj/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>AspectJ Compiler support for Plexus Compiler component.</description>
1515

1616
<properties>
17-
<maven.compiler.release>11</maven.compiler.release>
17+
<javaVersion>11</javaVersion>
1818
</properties>
1919

2020
<dependencies>

plexus-compilers/plexus-compiler-eclipse/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<description>Eclipse Compiler support for Plexus Compiler component.</description>
1515

1616
<properties>
17-
<maven.compiler.release>11</maven.compiler.release>
17+
<javaVersion>17</javaVersion>
1818
</properties>
1919

2020
<dependencies>

plexus-compilers/plexus-compiler-javac-errorprone/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
See https://errorprone.info</description>
1717

1818
<properties>
19-
<maven.compiler.release>11</maven.compiler.release>
19+
<javaVersion>11</javaVersion>
2020
</properties>
2121

2222
<dependencies>

pom.xml

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242

4343
<properties>
4444
<scm.url>scm:git:[email protected]:codehaus-plexus/plexus-compiler.git</scm.url>
45-
<javaVersion>11</javaVersion>
46-
<maven.compiler.release>8</maven.compiler.release>
45+
<javaVersion>8</javaVersion>
4746
<redirectTestOutputToFile>true</redirectTestOutputToFile>
4847
<project.build.outputTimestamp>2022-12-17T17:23:49Z</project.build.outputTimestamp>
4948
<jupiter.version>5.10.1</jupiter.version>
@@ -190,13 +189,6 @@
190189
<groupId>org.apache.maven.plugins</groupId>
191190
<artifactId>maven-enforcer-plugin</artifactId>
192191
<version>3.4.1</version>
193-
<dependencies>
194-
<dependency>
195-
<groupId>org.codehaus.mojo</groupId>
196-
<artifactId>extra-enforcer-rules</artifactId>
197-
<version>1.7.0</version>
198-
</dependency>
199-
</dependencies>
200192
<executions>
201193
<execution>
202194
<id>enforce-java</id>
@@ -206,26 +198,12 @@
206198
<configuration>
207199
<rules>
208200
<requireJavaVersion>
209-
<version>[11,)</version>
210-
<message>[ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 11 or newer</message>
201+
<version>[17,)</version>
202+
<message>[ERROR] OLD JDK [${java.version}] in use. This projects requires JDK 17 or newer</message>
211203
</requireJavaVersion>
212204
</rules>
213205
</configuration>
214206
</execution>
215-
<execution>
216-
<id>enforce-bytecode-version</id>
217-
<goals>
218-
<goal>enforce</goal>
219-
</goals>
220-
<configuration>
221-
<rules>
222-
<enforceBytecodeVersion>
223-
<maxJdkVersion>${maven.compiler.release}</maxJdkVersion>
224-
</enforceBytecodeVersion>
225-
</rules>
226-
<fail>true</fail>
227-
</configuration>
228-
</execution>
229207
</executions>
230208
</plugin>
231209

0 commit comments

Comments
 (0)