Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 12 commits into from
Mar 10, 2022
Merged

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

merged 12 commits into from
Mar 10, 2022

Conversation

pepness
Copy link
Member

@pepness pepness commented Feb 15, 2022 •
edited

Fixes Issue-3622

Library Notes:

  • Mavenize jaxws-api external jars
  • Utilize Eclipse Jakarta libraries (still using javax.* packages)
    • jaxws-api > jakarta.xml.ws-api
    • jsr181-api > jakarta.jws-api
    • saaj-api > jakarta.xml.soap-api
  • Woodstox change from org.codehaus.woodstox:woodstox-core-asl to com.fasterxml.woodstox:woodstox-core
  • Update licenses types where needed (checked all jars)
  • Remove uneeded dependency for jaxws21api:
    • javax.annotation.jar
  • Fix wrong paths directing to jaxws and jaxb jars

NetBeans Testing:

  • Full build done
  • Verify successfull execution of libraries and licenses Ant test
  • Verify successful execution of unit tests for modules j2ee.dd.webservice, websvc.jaxws21api, websvc.jaxws21, tomcat5, websvc.design, websvc.jaxwsmodel, websvc.manager, java.project.ui and wedsvc.saas.api
  • Started NetBeans and ensure the log didn't have any ERROR or new WARNINGS
  • Checked the files are in the Ant Library Manager
  • Successfully create project as per NetBeans Documentation, with Payara and Tomcat

Web Page:
https://projects.eclipse.org/projects/ee4j.jaxws

@pepness pepness added the Upgrade Library Library (Dependency) Upgrade label Feb 15, 2022
@pepness pepness added this to the NB14 milestone Feb 15, 2022
@pepness pepness self-assigned this Feb 15, 2022
@pepness pepness added the kind:bug Bug report or fix label Feb 19, 2022
@pepness pepness mentioned this pull request Feb 19, 2022
Closed
matthiasblaesing
matthiasblaesing reviewed Feb 21, 2022
View reviewed changes
Copy link
Contributor

@matthiasblaesing matthiasblaesing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a failure from the sigtest:

Class javax.xml.ws.spi.Provider

"E1.2 - API type removed" : field public final static java.lang.String javax.xml.ws.spi.Provider.JAXWSPROVIDER_PROPERTY = "javax.xml.ws.spi.Provider"

given, that this is a compile time constant, this should have been inlined at build time. I would consider living with that fact, rebuild the sigfiles and be done with it.

@pepness
Copy link
Member Author

pepness commented Feb 22, 2022

I ran ant gen-sigtests-release and then ant clean build check-sigtests-release -Dfail.on.error=true and the build was successful, but this generate all .sig files. How do I generate the .sig files for a single module?

@matthiasblaesing
Copy link
Contributor

The build scripts of the modules inherit from nbbuild/templates/projectized.xml. That build file defines two related targets:

  • gen-sigtest
  • check-sigtest

So you should be able to run ant gen-sigtest in the module directory (or use the IDE to invoke the target from the build.xml of the module).

@pepness
Copy link
Member Author

pepness commented Feb 24, 2022

Thank you for the guidance @matthiasblaesing, all test are successful now.

matthiasblaesing
matthiasblaesing approved these changes Feb 24, 2022
View reviewed changes
Copy link
Contributor

@matthiasblaesing matthiasblaesing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I have found a type (missing extension) and one question to improve my understanding. Apart from that this looks very good to me. Thank you.

java/websvc.jaxws21/nbproject/project.properties Outdated Show resolved Hide resolved
java/websvc.jaxws21/nbproject/project.xml Outdated
<package>com.sun.tools.ws</package>
<package>com.sun.tools.ws.ant</package>
<package>com.sun.tools.ws.api</package>
<package>com.sun.tools.ws.api.wsdl</package>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the new exports in this file needed for WSDL generation or what is the motivation? My curiosity was triggered by the com.sun.tools.ws.ant package.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed all the packages and added only the ones that the build process needed until it completed successfully, re gen-sigtests, check-sigtests and re-test everything as per the description. I think this is the correct approach.

@pepness
-Mavenize jaxws-api external jars
dbdbe46 
-Utilize jakarta libraries instead of javax
-Update license type to EDL-1.0 where needed
-Remove unneeded dependencies
@pepness
-Fix wrong paths directing to jaxws and jaxb jars
4341c1c 
-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
@pepness
-Fix wrong paths directing to jaxws and jaxb jars
0dbb323 
-Remove entries to ignore-binary-overlaps file
@pepness
Auto-generated file
0df6cca
@pepness
Update binaries from library JAX-WS 2.1 to 2.3
18c18cf
@pepness
Update licenses
704ae67
@pepness
Do no commit Auto-generated File
9917b6f
@pepness
Regenerate sigfiles
648731a
@pepness
Removed internal packages entries from <friend-packages> and place them
9c94103 
inside <public-packages>, but just the parent packages.
@pepness
Fix missing file extension
f3aac2e
@pepness
Added only the packages that the build process needed until it completed
0882232 
successfully
@pepness
Regenerate sigtests
b28c1cb
@mbien
Copy link
Member

mbien commented Mar 10, 2022

everything is green here too. Would you like to squash some/all of the commits?

@pepness
Copy link
Member Author

pepness commented Mar 10, 2022

I will, thanks Michael

@pepness pepness merged commit a7200bb into apache:master Mar 10, 2022
@pepness pepness mentioned this pull request Mar 10, 2022
Closed
philippefichet pushed a commit to philippefichet/netbeans that referenced this pull request Mar 11, 2022
@pepness @philippefichet
Upgrade Ant library JAX-WS from 2.2.6 to 2.3.3 (apache#3607)
8fb50ea 
-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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthiasblaesing matthiasblaesing matthiasblaesing approved these changes

Assignees

@pepness pepness

Labels
kind:bug Bug report or fix Upgrade Library Library (Dependency) Upgrade
Projects
None yet
Milestone
NB14
Development

Successfully merging this pull request may close these issues.

Apache Netbeans (all versions) do not support the generation of a Web Service from WSDL
3 participants
@pepness @matthiasblaesing @mbien