Add add jdk17 & jdk17 with errorprone profile

patrickfav · Feb 15, 2023 · 978579d · 978579d
1 parent 1626575
commit 978579d
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,6 +3,10 @@
 ## 19
 
 * increase duration CVEs are valid and ignore everything below CVSS 3.9
+* add jdk17 & jdk17 with errorprone profile
+* add site maven plugin version
+* update dependency check, surefire, javadoc plugin
+* update errorprone to latest 2.18 and to latest 2.10 for java 8
 
 ## 18.1
 

diff --git a/README.md b/README.md
@@ -92,7 +92,9 @@ Currently possible values:
 * `jdk8_w_errorprone`
 * `jdk11`
 * `jdk11_w_errorprone`
-* `jdk14`
+* `jdk17`
+* `jdk17_w_errorprone`
+
 
 You can check if the correct profile is set with
 

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
         <commonConfig.enforcer.reqMavenVersion>[3.3.9,)</commonConfig.enforcer.reqMavenVersion>
 
         <commonConfig.compile.plugin.version>3.10.1</commonConfig.compile.plugin.version>
-        <commonConfig.compile.errorprone.version>2.3.4</commonConfig.compile.errorprone.version>
+        <commonConfig.compile.errorprone.version>2.18.0</commonConfig.compile.errorprone.version>
 
         <commonConfig.deps.jackson-core.version>2.14.2</commonConfig.deps.jackson-core.version>
         <commonConfig.deps.jackson-jaxrs.version>${commonConfig.deps.jackson-core.version}
@@ -712,8 +712,8 @@
                                 <dependency>
                                     <groupId>com.google.errorprone</groupId>
                                     <artifactId>error_prone_core</artifactId>
-                                    <!-- only one compatible with java 7-->
-                                    <version>${commonConfig.compile.errorprone.version}</version>
+                                    <!-- only one compatible with java 8 -->
+                                    <version>2.10.0</version>
                                 </dependency>
                             </dependencies>
                         </plugin>
@@ -779,11 +779,45 @@
             </build>
         </profile>
         <profile>
-            <id>JDK_14</id>
+            <id>JDK_17_ERRORPRONE</id>
+            <activation>
+                <property>
+                    <name>commonConfig.compiler.profile</name>
+                    <value>jdk17_w_errorprone</value>
+                </property>
+            </activation>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <!-- error prone support -->
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <configuration>
+                                <release>17</release>
+                                <compilerArgs>
+                                    <arg>-XDcompilePolicy=simple</arg>
+                                    <arg>-Xplugin:ErrorProne</arg>
+                                </compilerArgs>
+                                <annotationProcessorPaths>
+                                    <path>
+                                        <groupId>com.google.errorprone</groupId>
+                                        <artifactId>error_prone_core</artifactId>
+                                        <version>${commonConfig.compile.errorprone.version}</version>
+                                    </path>
+                                </annotationProcessorPaths>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+            </build>
+        </profile>
+        <profile>
+            <id>JDK_17</id>
             <activation>
                 <property>
                     <name>commonConfig.compiler.profile</name>
-                    <value>jdk14</value>
+                    <value>jdk17</value>
                 </property>
             </activation>
             <build>
@@ -794,7 +828,7 @@
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-compiler-plugin</artifactId>
                             <configuration>
-                                <release>14</release>
+                                <release>17</release>
                             </configuration>
                         </plugin>
                     </plugins>