This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 4233774 AXIS2-6010 remove all 'endorsed' flags to the JDK as that
feature was removed in JDK 9
4233774 is described below
commit 42337741708664334adad69ee191b90afc7cbf0d
Author: Robert Lazarski <[email protected]>
AuthorDate: Mon Mar 21 05:44:30 2022 -1000
AXIS2-6010 remove all 'endorsed' flags to the JDK as that feature was
removed in JDK 9
---
modules/distribution/src/main/assembly/bin-assembly.xml | 10 ----------
modules/tool/script/axis2server.bat | 2 +-
modules/tool/script/axis2server.sh | 1 -
modules/tool/script/setenv.sh | 1 -
modules/webapp/scripts/build.xml | 1 -
5 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml
b/modules/distribution/src/main/assembly/bin-assembly.xml
index c926d22..334b7df 100755
--- a/modules/distribution/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/bin-assembly.xml
@@ -196,16 +196,6 @@
</excludes>
</dependencySet>
<dependencySet>
- <!-- This is necessary to use JAX-WS 2.2 on Java 1.6 -->
- <useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>lib/endorsed</outputDirectory>
- <includes>
- <include>javax.xml.bind:jaxb-api:jar</include>
-
<include>org.apache.geronimo.specs:geronimo-saaj_1.3_spec:jar</include>
-
<include>org.apache.geronimo.specs:geronimo-jaxws_2.2_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.apache.axis2:axis2-webapp</include>
diff --git a/modules/tool/script/axis2server.bat
b/modules/tool/script/axis2server.bat
index 5ae61bf..aaa1a83 100644
--- a/modules/tool/script/axis2server.bat
+++ b/modules/tool/script/axis2server.bat
@@ -105,7 +105,7 @@ echo Using JAVA_HOME %JAVA_HOME%
echo Using AXIS2_HOME %AXIS2_HOME%
cd %AXIS2_HOME%
-"%_JAVACMD%" %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!"
-Djava.endorsed.dirs="%AXIS2_HOME%\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
org.apache.axis2.transport.SimpleAxis2Server %AXIS2_CMD_LINE_ARGS%
+"%_JAVACMD%" %JAVA_OPTS% -cp "!AXIS2_CLASS_PATH!"
org.apache.axis2.transport.SimpleAxis2Server %AXIS2_CMD_LINE_ARGS%
goto end
:end
diff --git a/modules/tool/script/axis2server.sh
b/modules/tool/script/axis2server.sh
index a4bdb60..fe6aee8 100755
--- a/modules/tool/script/axis2server.sh
+++ b/modules/tool/script/axis2server.sh
@@ -61,6 +61,5 @@ while [ $# -ge 1 ]; do
done
java $JAVA_OPTS -classpath "$AXIS2_CLASSPATH" \
-
-Djava.endorsed.dirs="$AXIS2_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
org.apache.axis2.transport.SimpleAxis2Server \
-repo "$AXIS2_HOME"/repository -conf "$AXIS2_HOME"/conf/axis2.xml $*
diff --git a/modules/tool/script/setenv.sh b/modules/tool/script/setenv.sh
index d4bac81..4e14ed2 100644
--- a/modules/tool/script/setenv.sh
+++ b/modules/tool/script/setenv.sh
@@ -97,7 +97,6 @@ if $cygwin; then
AXIS2_HOME=`cygpath --absolute --windows "$AXIS2_HOME"`
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
AXIS2_CLASSPATH=`cygpath --path --windows "$AXIS2_CLASSPATH"`
- JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
fi
export AXIS2_HOME
diff --git a/modules/webapp/scripts/build.xml b/modules/webapp/scripts/build.xml
index c76460e..317de07 100644
--- a/modules/webapp/scripts/build.xml
+++ b/modules/webapp/scripts/build.xml
@@ -72,7 +72,6 @@
<war destfile="dist/axis2.war" webxml="webapp/WEB-INF/web.xml">
<lib dir="lib">
<include name="**" />
- <exclude name="endorsed/**" />
<exclude name="**servlet**" />
<exclude name="axis2-ant-plugin-*.jar" />
<exclude name="axis2-*-codegen-*.jar"/>
