Java 17 Support with Sigtest 2.2 from JakartaEE TCK Tools

Disabled sigtest where it does not work, fixed signature files/dependencies where it does. Update enterprise/web.jsf20/nbproject/project.properties Update java/j2ee.eclipselink/nbproject/project.properties Co-authored-by: Matthias Bläsing <mblaesing@doppel-helix.eu>
apache · Mar 24, 2024 · a74ce3b · a74ce3b
1 parent 306f174
commit a74ce3b
Show file tree

Hide file tree

Showing 29 changed files with 83,547 additions and 610 deletions.
diff --git a/enterprise/j2eeapis/nbproject/org-netbeans-modules-j2eeapis.sig b/enterprise/j2eeapis/nbproject/org-netbeans-modules-j2eeapis.sig
diff --git a/enterprise/web.jsf12/nbproject/org-netbeans-modules-web-jsf12.sig b/enterprise/web.jsf12/nbproject/org-netbeans-modules-web-jsf12.sig
diff --git a/enterprise/web.jsf12/nbproject/project.xml b/enterprise/web.jsf12/nbproject/project.xml
@@ -25,6 +25,22 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
             <code-name-base>org.netbeans.modules.web.jsf12</code-name-base>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.19</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.libs.jstl</code-name-base>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>2.58</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.servletjspapi</code-name-base>
                     <build-prerequisite/>

diff --git a/enterprise/web.jsf20/nbproject/org-netbeans-modules-web-jsf20.sig b/enterprise/web.jsf20/nbproject/org-netbeans-modules-web-jsf20.sig
diff --git a/enterprise/web.jsf20/nbproject/project.properties b/enterprise/web.jsf20/nbproject/project.properties
@@ -20,3 +20,8 @@ javac.source=1.8
 release.external/javax.faces-2.3.9.jar=modules/ext/jsf-2_2/javax.faces.jar
 release.external/javax.faces-2.3.9-license.txt=modules/ext/jsf-2_2/license.txt
 spec.version.base=1.57.0
+
+# Old library with too broadly defined API - sigtest would give more noise than benefit
+# (legacy behavior of sigtest ignored subpackages)
+sigtest.skip.gen=true
+
diff --git a/extide/libs.gradle/nbproject/org-netbeans-modules-libs-gradle.sig b/extide/libs.gradle/nbproject/org-netbeans-modules-libs-gradle.sig
diff --git a/extide/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties
@@ -19,7 +19,7 @@ nbm.needs.restart=true
 javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 
-# For more information, please see http://wiki.netbeans.org/SignatureTest
-sigtest.gen.fail.on.error=false
+# Sigtest fails to read the classes in the gradle-tooling-api
+sigtest.skip.gen=true
 
 release.external/gradle-tooling-api-8.6.jar=modules/gradle/gradle-tooling-api.jar