Skip to content

Commit 65c0b57

Browse files
committed
Raise minimum JDK to 11
#409
1 parent ab713be commit 65c0b57

6 files changed

Lines changed: 22 additions & 23 deletions

File tree

moneta-convert/moneta-convert-base/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<groupId>org.apache.maven.plugins</groupId>
3636
<artifactId>maven-compiler-plugin</artifactId>
3737
<configuration>
38-
<release>11</release>
38+
<release>${maven.compiler.release}</release>
3939
</configuration>
4040
<executions>
4141
<execution>
@@ -46,21 +46,21 @@
4646
<jdkToolchain>
4747
<version>11</version>
4848
</jdkToolchain>
49-
<release>11</release>
49+
<release>${maven.compiler.release}</release>
5050
</configuration>
5151
</execution>
5252
<execution>
5353
<id>base-compile</id>
5454
<goals>
5555
<goal>compile</goal>
5656
</goals>
57-
<!-- recompile everything for target VM except the module-info.java -->
57+
<!-- recompile everything for target VM except the module-info.java
5858
<configuration>
5959
<release>${maven.compiler.release}</release>
6060
<excludes>
6161
<exclude>module-info.java</exclude>
6262
</excludes>
63-
</configuration>
63+
</configuration> -->
6464
</execution>
6565
</executions>
6666
</plugin>

moneta-convert/moneta-convert-ecb/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<groupId>org.apache.maven.plugins</groupId>
4343
<artifactId>maven-compiler-plugin</artifactId>
4444
<configuration>
45-
<release>11</release>
45+
<release>${maven.compiler.release}</release>
4646
</configuration>
4747
<executions>
4848
<execution>
@@ -51,23 +51,23 @@
5151
<!-- compile everything to ensure module-info contains right entries -->
5252
<!-- required when JAVA_HOME is JDK 8 or below -->
5353
<jdkToolchain>
54-
<version>9</version>
54+
<version>11</version>
5555
</jdkToolchain>
56-
<release>9</release>
56+
<release>${maven.compiler.release}</release>
5757
</configuration>
5858
</execution>
5959
<execution>
6060
<id>base-compile</id>
6161
<goals>
6262
<goal>compile</goal>
6363
</goals>
64-
<!-- recompile everything for target VM except the module-info.java -->
64+
<!-- recompile everything for target VM except the module-info.java
6565
<configuration>
6666
<release>${maven.compiler.release}</release>
6767
<excludes>
6868
<exclude>module-info.java</exclude>
6969
</excludes>
70-
</configuration>
70+
</configuration> -->
7171
</execution>
7272
</executions>
7373
</plugin>

moneta-convert/moneta-convert-imf/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<groupId>org.apache.maven.plugins</groupId>
4848
<artifactId>maven-compiler-plugin</artifactId>
4949
<configuration>
50-
<release>9</release>
50+
<release>${maven.compiler.release}</release>
5151
</configuration>
5252
<executions>
5353
<execution>
@@ -56,23 +56,23 @@
5656
<!-- compile everything to ensure module-info contains right entries -->
5757
<!-- required when JAVA_HOME is JDK 8 or below -->
5858
<jdkToolchain>
59-
<version>9</version>
59+
<version>11</version>
6060
</jdkToolchain>
61-
<release>9</release>
61+
<release>${maven.compiler.release}</release>
6262
</configuration>
6363
</execution>
6464
<execution>
6565
<id>base-compile</id>
6666
<goals>
6767
<goal>compile</goal>
6868
</goals>
69-
<!-- recompile everything for target VM except the module-info.java -->
69+
<!-- recompile everything for target VM except the module-info.java
7070
<configuration>
7171
<release>${maven.compiler.release}</release>
7272
<excludes>
7373
<exclude>module-info.java</exclude>
7474
</excludes>
75-
</configuration>
75+
</configuration> -->
7676
</execution>
7777
</executions>
7878
</plugin>

moneta-core/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,23 +361,23 @@
361361
<jdkToolchain>
362362
<version>${maven.compiler.release}</version>
363363
</jdkToolchain>
364-
<release>11</release>
364+
<release>${maven.compiler.release}</release>
365365
</configuration>
366366
</execution>
367367
<execution>
368368
<id>base-compile</id>
369369
<goals>
370370
<goal>compile</goal>
371371
</goals>
372-
<!-- recompile everything for target VM except the module-info.java -->
372+
<!-- recompile everything for target VM except the module-info.java
373373
<configuration>
374374
<source>8</source>
375375
<target>8</target>
376376
<release>8</release>
377377
<excludes>
378378
<exclude>module-info.java</exclude>
379379
</excludes>
380-
</configuration>
380+
</configuration> -->
381381
</execution>
382382
</executions>
383383
</plugin>

moneta-test/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,26 @@
2828
<id>default-compile</id>
2929
<configuration>
3030
<!-- compile everything to ensure module-info contains right entries -->
31-
<!-- required when JAVA_HOME is JDK 8 or below -->
3231
<jdkToolchain>
3332
<version>${maven.compiler.release}</version>
3433
</jdkToolchain>
35-
<release>9</release>
34+
<release>${maven.compiler.release}</release>
3635
</configuration>
3736
</execution>
3837
<execution>
3938
<id>base-compile</id>
4039
<goals>
4140
<goal>compile</goal>
4241
</goals>
43-
<!-- recompile everything for target VM except the module-info.java -->
42+
<!-- recompile everything for target VM except the module-info.java
4443
<configuration>
4544
<source>8</source>
4645
<target>8</target>
4746
<release>8</release>
4847
<excludes>
4948
<exclude>module-info.java</exclude>
5049
</excludes>
51-
</configuration>
50+
</configuration> -->
5251
</execution>
5352
</executions>
5453
</plugin>

pom.xml

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

4343
<properties>
4444
<jsr.version>1.1</jsr.version>
45-
<jdkVersion>1.8</jdkVersion>
46-
<maven.compiler.release>8</maven.compiler.release>
45+
<jdkVersion>11</jdkVersion>
46+
<maven.compiler.release>11</maven.compiler.release>
4747

4848
<moduleDir>.</moduleDir>
4949
<basedir>.</basedir>

0 commit comments

Comments
 (0)