|
348 | 348 | <!-- Also set source/target, because several other plugins rely on this and don't understand release --> |
349 | 349 | <maven.compiler.source>${java-version.main.release}</maven.compiler.source> |
350 | 350 | <maven.compiler.target>${java-version.main.release}</maven.compiler.target> |
| 351 | + <maven.compiler.release>${java-version.main.release}</maven.compiler.release> |
351 | 352 | <maven.compiler.testSource>${java-version.test.release}</maven.compiler.testSource> |
352 | 353 | <maven.compiler.testTarget>${java-version.test.release}</maven.compiler.testTarget> |
353 | | - <maven.compiler.release>${java-version.main.release}</maven.compiler.release> |
354 | 354 | <maven.compiler.testRelease>${java-version.test.release}</maven.compiler.testRelease> |
355 | 355 |
|
356 | 356 | <!-- |
|
890 | 890 | <artifactId>forbiddenapis</artifactId> |
891 | 891 | <version>${version.forbiddenapis.plugin}</version> |
892 | 892 | <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: --> |
894 | 894 | <failOnUnsupportedJava>false</failOnUnsupportedJava> |
| 895 | + <failOnMissingClasses>false</failOnMissingClasses> |
895 | 896 | <ignoreSignaturesOfMissingClasses>true</ignoreSignaturesOfMissingClasses> |
896 | 897 | <suppressAnnotations> |
897 | 898 | <annotation>**.IgnoreForbiddenApisErrors</annotation> |
|
926 | 927 | <!-- These signatures on the top are not specific to any JDK version --> |
927 | 928 | <bundledSignature>jdk-system-out</bundledSignature> |
928 | 929 | <bundledSignature>jdk-non-portable</bundledSignature> |
| 930 | + <!-- The jdk-reflection is not yet something we can avoid --> |
| 931 | + <!--<bundledSignature>jdk-reflection</bundledSignature>--> |
929 | 932 |
|
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> |
936 | 937 |
|
| 938 | + <!-- All following signatures should be replicated for each target JDK version we intend to support --> |
937 | 939 | <bundledSignature>jdk-deprecated-17</bundledSignature> |
938 | 940 | <bundledSignature>jdk-deprecated-18</bundledSignature> |
939 | 941 | <bundledSignature>jdk-deprecated-19</bundledSignature> |
| 942 | + <bundledSignature>jdk-deprecated-20</bundledSignature> |
940 | 943 | <bundledSignature>jdk-deprecated-21</bundledSignature> |
941 | 944 | <bundledSignature>jdk-deprecated-22</bundledSignature> |
| 945 | + <bundledSignature>jdk-deprecated-23</bundledSignature> |
| 946 | + <bundledSignature>jdk-deprecated-24</bundledSignature> |
| 947 | + <bundledSignature>jdk-deprecated-25</bundledSignature> |
942 | 948 |
|
943 | 949 | <bundledSignature>jdk-internal-17</bundledSignature> |
944 | 950 | <bundledSignature>jdk-internal-18</bundledSignature> |
945 | 951 | <bundledSignature>jdk-internal-19</bundledSignature> |
| 952 | + <bundledSignature>jdk-internal-20</bundledSignature> |
946 | 953 | <bundledSignature>jdk-internal-21</bundledSignature> |
947 | 954 | <bundledSignature>jdk-internal-22</bundledSignature> |
| 955 | + <bundledSignature>jdk-internal-23</bundledSignature> |
| 956 | + <bundledSignature>jdk-internal-24</bundledSignature> |
| 957 | + <bundledSignature>jdk-internal-25</bundledSignature> |
948 | 958 | </bundledSignatures> |
949 | 959 | </configuration> |
950 | 960 | </execution> |
|
955 | 965 | </goals> |
956 | 966 | <phase>verify</phase> |
957 | 967 | <configuration> |
| 968 | + <!-- Limit the JDK to the latest signature available one --> |
| 969 | + <testReleaseVersion>${jdk.min.version}</testReleaseVersion> |
958 | 970 | <bundledSignatures> |
959 | 971 | <bundledSignature>jdk-deprecated</bundledSignature> |
| 972 | + <bundledSignature>jdk-non-portable</bundledSignature> |
| 973 | + <bundledSignature>jdk-internal</bundledSignature> |
960 | 974 | </bundledSignatures> |
961 | 975 | </configuration> |
962 | 976 | </execution> |
|
1182 | 1196 | <!-- Java 17+ adds a warning for every single class/method/etc. without a javadoc comment, and we have lots of those.--> |
1183 | 1197 | <additionalOption>-Xdoclint:all,-missing</additionalOption> |
1184 | 1198 | </additionalOptions> |
1185 | | - <stylesheetfile>${project.build.directory}/hibernate-asciidoctor-theme/javadoc/jdk21/stylesheet.css</stylesheetfile> |
| 1199 | +<!-- <stylesheetfile>${project.build.directory}/hibernate-asciidoctor-theme/javadoc/jdk21/stylesheet.css</stylesheetfile>--> |
1186 | 1200 | </configuration> |
1187 | 1201 | </plugin> |
1188 | 1202 | <plugin> |
|
0 commit comments