PAYARA-4218 Add JDK11 support to JAX-WS commands #4291
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Jenkins test please |
Cousjava
changed the title
Pandrex247
requested changes
Nov 6, 2019
| @@ -59,4 +59,11 @@ if [ ${AS_JAVA} ]; then | |||
| JAVA=${AS_JAVA}/bin/java | |||
| fi | |||
|
|
|||
| exec "$JAVA" $WSCOMPILE_OPTS -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/javax.xml.rpc-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar:$AS_INSTALL_LIB/aixporting-repackaged.jar" com.sun.xml.rpc.tools.wscompile.Main "$@" | |||
| ./jdkcheck | |||
There was a problem hiding this comment.
This isn't safe - you're assuming that the script is being invoked from the bin directory, which it may not be.
| exec "$JAVA" $WSCOMPILE_OPTS -Djava.endorsed.dirs="$AS_INSTALL_LIB/endorsed" -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/javax.xml.rpc-api.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$JAVAX_MAIL_JAR:$JAVA_HOME/lib/tools.jar:$AS_INSTALL_LIB/aixporting-repackaged.jar" com.sun.xml.rpc.tools.wscompile.Main "$@" | ||
| ./jdkcheck | ||
|
|
||
| if [ checkEndorsedAvailable = true ] |
There was a problem hiding this comment.
I'm not sure this works, either the method is wrong or the if syntax is wrong. Running with the following Java version has it go into the JDK11 block
openjdk version "1.8.0_222"
OpenJDK Runtime Environment (IcedTea 3.13.0) (build 1.8.0_222-b10 suse-lp151.2.3.1-x86_64)
OpenJDK 64-Bit Server VM (build 25.222-b10, mixed mode)
pdudits
reviewed
Nov 7, 2019
appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat
Outdated
Show resolved
Hide resolved
Cousjava
force-pushed
the
PAYARA-4128-jaxws-commands-jdk11
branch
from
a15df2c
to
d59aa1d
Compare
|
Jenkins test please |
|
Jenkins test please |
pdudits
approved these changes
Nov 12, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This is a bug fix
This allows running of the JAX-WS commands i.e.
wsimport,wscompileon both JDKs 8 and 11, since the endorsed has been removed in JDK9+ and required classes were removed from Java SE in JDK11.Testing
Testing Performed
Ran all changed commands on JDKs 8 and 11 on Windows and Linux
Testing Environment
Zulu JDK 1.8_222 on Ubuntu 19.04
Zulu JDK 11.0.5 on Ubuntu 19.04
IBM JDK 1.8_221 on Ubuntu 19.04
Zulu JDK 1.8_181 on Windows 10
Zulu JDK 11.0.3 on Windows 10