Upgrade Ant library JAX-WS from 2.2.6 to 2.3.3 (apache#3607)

-Mavenize jaxws-api external jars -Utilize jakarta libraries instead of javax -Update license type to EDL-1.0 where needed -Remove unneeded dependencies -Fix wrong paths directing to jaxws and jaxb jars -Replace old javax dependencies with new ones from Eclipse Jakarta: --jaxws-api > jakarta.xml.ws-api --jsr181-api > jakarta.jws-api --saaj-api > jakarta.xml.soap-api
akhil9281 · Mar 10, 2022 · a7200bb · a7200bb
1 parent 409100c
commit a7200bb
Show file tree

Hide file tree

Showing 33 changed files with 615 additions and 5,647 deletions.
diff --git a/enterprise/j2ee.dd.webservice/nbproject/project.properties b/enterprise/j2ee.dd.webservice/nbproject/project.properties
@@ -26,7 +26,7 @@ javadoc.docfiles=${basedir}/doc
 # needed for the WebServiceTestCase class
 test.unit.cp.extra=\
     ${nb_all}/enterprise/j2ee.dd/external/javaee-api-5.jar:\
-    ${websvc.jaxws21api.dir}/modules/ext/jaxws21/api/jsr181-api.jar
+    ${websvc.jaxws21api.dir}/modules/ext/jaxws22/api/jakarta.jws-api.jar
 test.config.stableBTD.includes=**/*Test.class
 
 requires.nb.javac=true
diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogViewer.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogViewer.java
@@ -217,7 +217,7 @@ private void processLine(String line) {
             }
         } else {
             if (line.contains("java.lang.LinkageError: JAXB 2.0 API")) { // NOI18N
-                File jaxwsApi = InstalledFileLocator.getDefault().locate("modules/ext/jaxws21/api/jaxws-api.jar", null, false); // NOI18N
+                File jaxwsApi = InstalledFileLocator.getDefault().locate("modules/ext/jaxws22/api/jakarta.xml.ws-api.jar", null, false); // NOI18N
                 File jaxbApi = InstalledFileLocator.getDefault().locate("modules/ext/jaxb/api/jaxb-api.jar", null, false); // NOI18N
                 File endoresedDir = tomcatManager.getTomcatProperties().getJavaEndorsedDir();
                 if (jaxwsApi != null && jaxbApi != null) {

diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/ServerLog.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/ServerLog.java
@@ -269,7 +269,7 @@ public void processLine(String line) {
             } else {
                 writer.println(line);
                 if (line.startsWith("SEVERE: WSSERVLET11: failed to parse runtime descriptor: java.lang.LinkageError:")) { // NOI18N
-                    File jaxwsApi = InstalledFileLocator.getDefault().locate("modules/ext/jaxws21/api/jaxws-api.jar", null, false); // NOI18N
+                    File jaxwsApi = InstalledFileLocator.getDefault().locate("modules/ext/jaxws22/api/jakarta.xml.ws-api.jar", null, false); // NOI18N
                     File jaxbApi  = InstalledFileLocator.getDefault().locate("modules/ext/jaxb/api/jaxb-api.jar", null, false); // NOI18N
                     File endoresedDir = tomcatManager.getTomcatProperties().getJavaEndorsedDir();
                     if (jaxwsApi != null && jaxbApi != null) {

diff --git a/enterprise/websvc.design/nbproject/project.properties b/enterprise/websvc.design/nbproject/project.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-javac.compilerargs=-Xlint:unchecked
-javac.source=1.6
-test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws21/api
-test.unit.cp.extra=${websvc.jaxws21api.dir}/modules/ext/jaxws21/api/jsr181-api.jar
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
+test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws22/api
+test.unit.cp.extra=${websvc.jaxws21api.dir}/modules/ext/jaxws22/api/jakarta.jws-api.jar
diff --git a/enterprise/websvc.jaxwsmodel/nbproject/project.properties b/enterprise/websvc.jaxwsmodel/nbproject/project.properties
@@ -14,8 +14,10 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-javac.source=1.6
-test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws21/api
+
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
+test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws22/api
 
 test.config.stableBTD.includes=**/*Test.class
 test.config.stableBTD.excludes=\

diff --git a/enterprise/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/api/jaxws/project/WSUtils.java b/enterprise/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/api/jaxws/project/WSUtils.java
@@ -360,7 +360,7 @@ public static FileObject backupAndGenerateJaxWs(FileObject projectDir, FileObjec
     }
 
     private static String getJaxWsApiDir() {
-        File jaxwsApi = InstalledFileLocator.getDefault().locate("modules/ext/jaxws22/api/jaxws-api.jar", null, false); // NOI18N
+        File jaxwsApi = InstalledFileLocator.getDefault().locate("modules/ext/jaxws22/api/jakarta.xml.ws-api.jar", null, false); // NOI18N
         if (jaxwsApi!=null) {
             File jaxbApi =  InstalledFileLocator.getDefault().locate("modules/ext/jaxb/api/jaxb-api.jar", null, false); // NOI18N
             return jaxwsApi.getParent()+(jaxbApi != null? ":"+jaxbApi.getParent() : ""); //NOI18N
@@ -408,9 +408,9 @@ public static Library createJaxWsApiLibrary() throws IOException {
 
     private static List<URL> getJaxWsApiJars() throws IOException {
         List<URL> urls = new ArrayList<URL>();
-        File apiJar = InstalledFileLocator.getDefault().locate("modules/ext/jaxws22/api/jaxws-api.jar", null, false); // NOI18N
+        File apiJar = InstalledFileLocator.getDefault().locate("modules/ext/jaxws22/api/jakarta.xml.ws-api.jar", null, false); // NOI18N
         if (apiJar != null) {
-            URL url = new URL("jar:nbinst://org.netbeans.modules.websvc.jaxws21api/modules/ext/jaxws22/api/jaxws-api.jar!/");
+            URL url = new URL("jar:nbinst://org.netbeans.modules.websvc.jaxws21api/modules/ext/jaxws22/api/jakarta.xml.ws-api.jar!/");
             /*URL url = apiJar.toURI().toURL();
             if (FileUtil.isArchiveFile(url)) {
                 urls.add(FileUtil.getArchiveRoot(url));

diff --git a/enterprise/websvc.manager/nbproject/project.properties b/enterprise/websvc.manager/nbproject/project.properties
@@ -17,4 +17,4 @@
 
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.source=1.8
-test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws21/api
+test-unit-sys-prop.java.endorsed.dirs=${websvc.jaxws21.dir}/modules/ext/jaxws22/api
diff --git a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/codegen/Wsdl2Java.java b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/codegen/Wsdl2Java.java
@@ -74,7 +74,7 @@ public class Wsdl2Java {
 
     // TODO generate this dynamically instead of using a hardcoded value
     private static final String JAXB_ENDORSED_REF = "modules/ext/jaxb/api/jaxb-api.jar";
-    private static final String JAXWS_ENDORSED_REF = "modules/ext/jaxws22/api/jaxws-api.jar";
+    private static final String JAXWS_ENDORSED_REF = "modules/ext/jaxws22/api/jakarta.xml.ws-api.jar";
 
     private final String userDir = System.getProperty("netbeans.user");
 

diff --git a/...rise/websvc.manager/test/unit/src/org/netbeans/modules/websvc/manager/test/SetupUtil.java b/...rise/websvc.manager/test/unit/src/org/netbeans/modules/websvc/manager/test/SetupUtil.java
@@ -58,7 +58,7 @@ public class SetupUtil {
     private static final String CATALOG_FILE = "uszip-asmx-catalog/catalog.xml";
     private static final String WSDL_FILE = "uszip-asmx-catalog/www.webservicemart.com/uszip.asmx.wsdl";
 
-    private static final String ENDORSED_REF = "modules/ext/jaxws21/api/jaxws-api.jar";
+    private static final String ENDORSED_REF = "modules/ext/jaxws22/api/jakarta.xml.ws-api.jar";
     private static final String JAXWS_LIB_PROPERTY = "libs.jaxws21.classpath";
 
     public static SetupData commonSetUp(File workingDir) throws Exception {

diff --git a/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java b/java/java.project.ui/test/qa-functional/src/projects/LibrariesTest.java
@@ -131,23 +131,19 @@ public void init1() {
         set.add("jar:nbinst://org.netbeans.modules.form/modules/ext/AbsoluteLayout.jar!/");
         librariesUrls.put("absolutelayout", set);
         set = new TreeSet<String>();
-        set.add("jar:nbinst:///modules/ext/jaxws21/FastInfoset.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/activation.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/api/jaxb-api.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/api/jaxws-api.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/api/jsr173_api.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/api/jsr181-api.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/api/saaj-api.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/http.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/jaxb-impl.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/jaxb-xjc.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/jaxws-rt.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/jaxws-tools.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/jsr250-api.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/saaj-impl.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/sjsxp.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/stax-ex.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/streambuffer.jar!/");
+        set.add("jar:nbinst://org.netbeans.modules.xml.jaxb.api/modules/ext/jaxb/api/jaxb-api.jar!/");
+        set.add("jar:nbinst://org.netbeans.modules.xml.jaxb.api/modules/ext/jaxb/activation.jar!/");
+        set.add("jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb-impl.jar!/");
+        set.add("jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb-xjc.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/api/jakarta.jws-api.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/api/jakarta.xml.soap-api.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/api/jakarta.xml.ws-api.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/FastInfoset.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/jaxws-rt.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/jaxws-tools.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/saaj-impl.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/stax-ex.jar!/");
+        set.add("jar:nbinst:///modules/ext/jaxws22/streambuffer.jar!/");
         librariesUrls.put("jaxws20", set);
         set = new TreeSet<String>();
         set.add("jar:nbinst:///docs/org-netbeans-libs-javacapi.zip!/");
@@ -159,11 +155,10 @@ public void init1() {
         set.add("jar:nbinst://org.netbeans.libs.jstl/modules/ext/jstl-impl.jar!/");
         librariesUrls.put("jstl", set);
         set = new TreeSet<String>();
-        set.add("jar:nbinst:///modules/ext/jaxws21/activation.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/api/jaxb-api.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/api/jsr173_api.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/jaxb-impl.jar!/");
-        set.add("jar:nbinst:///modules/ext/jaxws21/jaxb-xjc.jar!/");
+        set.add("jar:nbinst://org.netbeans.modules.xml.jaxb.api/modules/ext/jaxb/api/jaxb-api.jar!/");
+        set.add("jar:nbinst://org.netbeans.modules.xml.jaxb.api/modules/ext/jaxb/activation.jar!/");
+        set.add("jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb-impl.jar!/");
+        set.add("jar:nbinst://org.netbeans.libs.jaxb/modules/ext/jaxb/jaxb-xjc.jar!/");
         librariesUrls.put("jaxb20", set);
         set = new TreeSet<String>();
         set.add("jar:nbinst://org.netbeans.modules.swingapp/docs/appframework-0.30-doc.zip!/");

diff --git a/java/websvc.jaxws21/external/binaries-list b/java/websvc.jaxws21/external/binaries-list
@@ -15,18 +15,18 @@
 # specific language governing permissions and limitations
 # under the License.
 
-279E959309368046456F10EFC2BF0BD61CE98CF0 javax.xml.ws:jaxws-api:2.2.6:javadoc
-E8C1C096162A146C2D84135C5036EDF54C1B1D38 com.sun.xml.fastinfoset:FastInfoset:1.2.12
-3502C55C7AD2085ECE6B38202B5169DD9177E0A2 org.glassfish.gmbal:gmbal-api-only:3.1.0-b001
-260AC0DBF841E1D19AE0405A894515E67EF41F4B org.glassfish.ha:ha-api:3.1.8
-1AA1579AE5ECD41920C4F355B0A9EF40B68315DD javax.mail:mail:1.4
-F98B197F1C26536A709E6016CC238E79E58AA6E3 com.sun.xml.ws:jaxws-rt:2.2.6-1
-036033A238FBDFBF6FB47B7F3E644C90D0E9A805 com.sun.xml.ws:jaxws-tools:2.2.6-1
-707686D845FAEDE060B79BDF018A25A469A611B4 org.glassfish.external:management-api:3.0.0-b012
-E0B2ED6E9CCAAFE3E96294A181C09E3AAE18AA90 org.jvnet.mimepull:mimepull:1.8
-AE9BFCE521AAB950D13D4447ACEC0BC1EFC5C9E8 com.sun.xml.ws:policy:2.3.1
-353EC287FADE0062410E10D788350BDFB0F9C13B com.sun.xml.messaging.saaj:saaj-impl:1.3.18
-21075D99A7A3BD39EF5A987BC310E905DA9FF899 org.jvnet.staxex:stax-ex:1.7
-0466EAB062E9D1A3CE2C4631B6D09B5E5C0CBD1B org.codehaus.woodstox:stax2-api:3.1.1
-AB7C3890FF7A0A5331C2F8938B02472E3D73A0D8 com.sun.xml.stream.buffer:streambuffer:1.4
-B8DF430DDC4947BC7B68AF5ED09B8C1C5B527553 org.codehaus.woodstox:woodstox-core-asl:4.1.2
+7A7F3AEBC29CC48F0EBB36E04A0A2BC07810B279 jakarta.xml.ws:jakarta.xml.ws-api:2.3.3:javadoc
+1FF236E65AA1ADBBD4A905EB6024FB941A875816 com.sun.xml.ws:jaxws-rt:2.3.5
+24ACE1F82679B5E40D59B5F07247D837005C6CFF com.sun.xml.ws:jaxws-tools:2.3.5
+319DF0E9D536C1A01ACDFE49B6E82B97D2393073 com.sun.mail:jakarta.mail:1.6.7
+BB625B47077E7D5A1CEE739809770EF21686F1D0 com.sun.xml.ws:policy:2.7.10
+5A2390FED950856EABA2719B8339D2D8D53DD00A com.sun.xml.fastinfoset:FastInfoset:2.0.0
+AE486D7FA91A2F24B8354E3EF843226C574C3644 com.sun.xml.stream.buffer:streambuffer:1.5.10
+1CD4AA51EA7A8987FE930083E3CD05E2AC72505B com.sun.xml.messaging.saaj:saaj-impl:1.5.3
+34E9DA5CAF0DED547B73AA2604E07B76E083CDAF org.glassfish.gmbal:gmbal-api-only:4.0.3
+1F7D0981A35D00097ED3FAEAD8FCEB2E4E5220E2 org.glassfish.ha:ha-api:3.1.13
+27374B34EFEEC7949B25729BF9EAB89A221F375C org.glassfish.external:management-api:3.2.3
+60F9A7991AD9EC1A280DB8DEEA216A91C10AAE74 org.jvnet.mimepull:mimepull:1.9.15
+4D69B68EE007AA15238CD4477392068B32747DF3 org.jvnet.staxex:stax-ex:1.8.3
+670748292899C53B1963730D9EB7F8AB71314E90 com.fasterxml.woodstox:woodstox-core:6.2.8
+A3F7325C52240418C2BA257B103C3C550E140C83 org.codehaus.woodstox:stax2-api:4.2.1