You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/07/28 20:57:38 UTC
[tomcat] branch main updated (8e8f634 -> 09193e0)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 8e8f634 Update comment
new 6666b63 Reword references to Java 9
new b2b9ea8 Java 9+ settings no longer need to be optional
new 09193e0 Resource files were renamed to LocalStrings...
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/catalina.bat | 2 +-
bin/catalina.sh | 2 +-
build.xml | 53 ++++++++++++-----------------------------------------
3 files changed, 14 insertions(+), 43 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Reword references to Java 9
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6666b63bc4d4b41a23b211196a7be9b98449e93c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 28 21:54:44 2021 +0100
Reword references to Java 9
---
bin/catalina.bat | 2 +-
bin/catalina.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/catalina.bat b/bin/catalina.bat
index 6a322a7..8ef19fe 100755
--- a/bin/catalina.bat
+++ b/bin/catalina.bat
@@ -217,7 +217,7 @@ if not "%LOGGING_MANAGER%" == "" goto noJuliManager
set LOGGING_MANAGER=-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager
:noJuliManager
-rem Configure JAVA 9 specific start-up parameters
+rem Configure module start-up parameters
set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.lang=ALL-UNNAMED"
set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.io=ALL-UNNAMED"
set "JDK_JAVA_OPTIONS=%JDK_JAVA_OPTIONS% --add-opens=java.base/java.util=ALL-UNNAMED"
diff --git a/bin/catalina.sh b/bin/catalina.sh
index 57627bb..1bf92a9 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -290,7 +290,7 @@ if [ "$USE_NOHUP" = "true" ]; then
_NOHUP="nohup"
fi
-# Add the JAVA 9 specific start-up parameters required by Tomcat
+# Add the module start-up parameters required by Tomcat
JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.lang=ALL-UNNAMED"
JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.io=ALL-UNNAMED"
JDK_JAVA_OPTIONS="$JDK_JAVA_OPTIONS --add-opens=java.base/java.util=ALL-UNNAMED"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Java 9+ settings no longer need to be optional
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b2b9ea8417db3efc6cf8dd6fef877a4639adb9bb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 28 21:55:05 2021 +0100
Java 9+ settings no longer need to be optional
---
build.xml | 51 +++++++++++----------------------------------------
1 file changed, 11 insertions(+), 40 deletions(-)
diff --git a/build.xml b/build.xml
index 4d6775e..12a1eb2 100644
--- a/build.xml
+++ b/build.xml
@@ -210,33 +210,6 @@
<defaultexcludes remove="**/.gitignore" />
<!--<defaultexcludes echo="true" />-->
- <!-- Java 9 -->
- <available classname="java.lang.reflect.InaccessibleObjectException"
- property="java9.javadoc.options"
- value="-html5"/>
- <property name="java9.javadoc.options" value=""/>
-
- <available classname="java.lang.reflect.InaccessibleObjectException"
- property="java9.test.option.1"
- value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
- <property name="java9.test.option.1" value="-Dtest.1=1"/>
- <available classname="java.lang.reflect.InaccessibleObjectException"
- property="java9.test.option.2"
- value="--add-opens=java.base/java.io=ALL-UNNAMED"/>
- <property name="java9.test.option.2" value="-Dtest.2=2"/>
- <available classname="java.lang.reflect.InaccessibleObjectException"
- property="java9.test.option.3"
- value="--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"/>
- <property name="java9.test.option.3" value="-Dtest.3=3"/>
- <available classname="java.lang.reflect.InaccessibleObjectException"
- property="java9.test.option.4"
- value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
- <property name="java9.test.option.4" value="-Dtest.4=4"/>
- <available classname="java.lang.reflect.InaccessibleObjectException"
- property="java9.test.option.5"
- value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
- <property name="java9.test.option.5" value="-Dtest.5=5"/>
-
<!-- Classpaths -->
<path id="compile.classpath">
<pathelement location="${bnd.jar}"/>
@@ -1984,13 +1957,11 @@
<jvmarg value="${test.formatter}"/>
<jvmarg value="-Djava.net.preferIPv4Stack=${java.net.preferIPv4Stack}"/>
<jvmarg value="-Dorg.apache.tomcat.util.net.NioSelectorShared=${org.apache.tomcat.util.net.NioSelectorShared}"/>
-
- <!-- Java 9 -->
- <jvmarg value="${java9.test.option.1}"/>
- <jvmarg value="${java9.test.option.2}"/>
- <jvmarg value="${java9.test.option.3}"/>
- <jvmarg value="${java9.test.option.4}"/>
- <jvmarg value="${java9.test.option.5}"/>
+ <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
+ <jvmarg value="--add-opens=java.base/java.io=ALL-UNNAMED"/>
+ <jvmarg value="--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"/>
+ <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
+ <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
<classpath refid="tomcat.test.run.classpath" />
@@ -2259,7 +2230,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ additionalparam="-breakiterator -notimestamp -html5"
source="${compile.source}"
maxmemory="512m"
failonerror="true"
@@ -2281,7 +2252,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ additionalparam="-breakiterator -notimestamp -html5"
source="${compile.source}"
maxmemory="512m"
failonerror="true"
@@ -2302,7 +2273,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ additionalparam="-breakiterator -notimestamp -html5"
source="${compile.source}"
maxmemory="512m"
failonerror="true"
@@ -2323,7 +2294,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ additionalparam="-breakiterator -notimestamp -html5"
source="${compile.source}"
maxmemory="512m"
failonerror="true"
@@ -2344,7 +2315,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ additionalparam="-breakiterator -notimestamp -html5"
source="${compile.source}"
maxmemory="512m"
failonerror="true"
@@ -2384,7 +2355,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
+ additionalparam="-breakiterator -notimestamp -html5"
source="${compile.source}"
maxmemory="512m"
failonerror="true"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Resource files were renamed to LocalStrings...
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 09193e0514ac449df454184941bba492d9b20a85
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 28 21:55:34 2021 +0100
Resource files were renamed to LocalStrings...
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 12a1eb2..80f0495 100644
--- a/build.xml
+++ b/build.xml
@@ -968,7 +968,7 @@
<!-- Convert the message files from UTF-8 to ASCII. This can be removed
after upgrading to Java 9+ as the minimum JRE and specifying the encoding
when loading the ResourceBundles -->
- <native2ascii src="java" dest="${tomcat.classes}" includes="**/LocalStrings.properties,**/Messages*.properties" encoding="UTF-8"/>
+ <native2ascii src="java" dest="${tomcat.classes}" includes="**/LocalStrings.properties" encoding="UTF-8"/>
<native2ascii src="java" dest="${tomcat.i18n}" includes="**/LocalStrings_*.properties" encoding="UTF-8"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org