Skip to content

Commit 5b626ce

Browse files
committed
HV-2145 Update forbidden api configuration
Signed-off-by: marko-bekhta <[email protected]>
1 parent b50cc51 commit 5b626ce

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

pom.xml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,9 @@
348348
<!-- Also set source/target, because several other plugins rely on this and don't understand release -->
349349
<maven.compiler.source>${java-version.main.release}</maven.compiler.source>
350350
<maven.compiler.target>${java-version.main.release}</maven.compiler.target>
351+
<maven.compiler.release>${java-version.main.release}</maven.compiler.release>
351352
<maven.compiler.testSource>${java-version.test.release}</maven.compiler.testSource>
352353
<maven.compiler.testTarget>${java-version.test.release}</maven.compiler.testTarget>
353-
<maven.compiler.release>${java-version.main.release}</maven.compiler.release>
354354
<maven.compiler.testRelease>${java-version.test.release}</maven.compiler.testRelease>
355355

356356
<!--
@@ -890,8 +890,9 @@
890890
<artifactId>forbiddenapis</artifactId>
891891
<version>${version.forbiddenapis.plugin}</version>
892892
<configuration>
893-
<!-- if the Java version used is too new, don't fail, just do nothing -->
893+
<!-- if the used Java version is too new, don't fail, just do nothing: -->
894894
<failOnUnsupportedJava>false</failOnUnsupportedJava>
895+
<failOnMissingClasses>false</failOnMissingClasses>
895896
<ignoreSignaturesOfMissingClasses>true</ignoreSignaturesOfMissingClasses>
896897
<suppressAnnotations>
897898
<annotation>**.IgnoreForbiddenApisErrors</annotation>
@@ -926,25 +927,32 @@
926927
<!-- These signatures on the top are not specific to any JDK version -->
927928
<bundledSignature>jdk-system-out</bundledSignature>
928929
<bundledSignature>jdk-non-portable</bundledSignature>
930+
<!-- The jdk-reflection is not yet something we can avoid -->
931+
<!--<bundledSignature>jdk-reflection</bundledSignature>-->
929932

930-
<!-- All following signatures should be replicated for each target JDK version we intend to support -->
931-
<bundledSignature>jdk-unsafe-17</bundledSignature>
932-
<bundledSignature>jdk-unsafe-18</bundledSignature>
933-
<bundledSignature>jdk-unsafe-19</bundledSignature>
934-
<bundledSignature>jdk-unsafe-21</bundledSignature>
935-
<bundledSignature>jdk-unsafe-22</bundledSignature>
933+
<!-- These signatures can safely be limited to the current JDK;
934+
see https://github.com/policeman-tools/forbidden-apis/issues/197#issuecomment-1080370368
935+
-->
936+
<bundledSignature>jdk-unsafe</bundledSignature>
936937

938+
<!-- All following signatures should be replicated for each target JDK version we intend to support -->
937939
<bundledSignature>jdk-deprecated-17</bundledSignature>
938940
<bundledSignature>jdk-deprecated-18</bundledSignature>
939941
<bundledSignature>jdk-deprecated-19</bundledSignature>
942+
<bundledSignature>jdk-deprecated-20</bundledSignature>
940943
<bundledSignature>jdk-deprecated-21</bundledSignature>
941944
<bundledSignature>jdk-deprecated-22</bundledSignature>
945+
<bundledSignature>jdk-deprecated-23</bundledSignature>
946+
<bundledSignature>jdk-deprecated-24</bundledSignature>
942947

943948
<bundledSignature>jdk-internal-17</bundledSignature>
944949
<bundledSignature>jdk-internal-18</bundledSignature>
945950
<bundledSignature>jdk-internal-19</bundledSignature>
951+
<bundledSignature>jdk-internal-20</bundledSignature>
946952
<bundledSignature>jdk-internal-21</bundledSignature>
947953
<bundledSignature>jdk-internal-22</bundledSignature>
954+
<bundledSignature>jdk-internal-23</bundledSignature>
955+
<bundledSignature>jdk-internal-24</bundledSignature>
948956
</bundledSignatures>
949957
</configuration>
950958
</execution>
@@ -955,8 +963,12 @@
955963
</goals>
956964
<phase>verify</phase>
957965
<configuration>
966+
<!-- Limit the JDK to the latest signature available one -->
967+
<testReleaseVersion>24</testReleaseVersion>
958968
<bundledSignatures>
959969
<bundledSignature>jdk-deprecated</bundledSignature>
970+
<bundledSignature>jdk-non-portable</bundledSignature>
971+
<bundledSignature>jdk-internal</bundledSignature>
960972
</bundledSignatures>
961973
</configuration>
962974
</execution>
@@ -1182,7 +1194,7 @@
11821194
<!-- Java 17+ adds a warning for every single class/method/etc. without a javadoc comment, and we have lots of those.-->
11831195
<additionalOption>-Xdoclint:all,-missing</additionalOption>
11841196
</additionalOptions>
1185-
<stylesheetfile>${project.build.directory}/hibernate-asciidoctor-theme/javadoc/jdk21/stylesheet.css</stylesheetfile>
1197+
<!-- <stylesheetfile>${project.build.directory}/hibernate-asciidoctor-theme/javadoc/jdk21/stylesheet.css</stylesheetfile>-->
11861198
</configuration>
11871199
</plugin>
11881200
<plugin>

0 commit comments

Comments
 (0)