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 2019/07/03 06:39:56 UTC
[tomcat] branch master updated (c4136df -> 1742314)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from c4136df Once a URI is identified as invalid don't attempt to process it further.
new b1d97e3 Update reference to migrated wiki content
new f47e1c7 Update Tomcat Native to 1.2.23
new a57b1fb Update Eclipse compiler to 4.12 (a.k.a 3.18.0)
new b84411a Copy improved Javadoc from 8.5.x
new 1742314 Remove Gump debug code
The 5 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:
build.properties.default | 18 +++++++++---------
.../org/apache/catalina/core/AprLifecycleListener.java | 2 +-
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
test/javax/el/TestImportHandlerStandardPackages.java | 2 --
.../catalina/startup/TesterServletEncodeUrl.java | 7 +++++++
webapps/docs/changelog.xml | 6 ++++++
11 files changed, 29 insertions(+), 18 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/05: Copy improved Javadoc from 8.5.x
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b84411a48e2ad1b655e64d6592f60c77669bbc2d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 2 20:55:17 2019 +0100
Copy improved Javadoc from 8.5.x
---
test/org/apache/catalina/startup/TesterServletEncodeUrl.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/test/org/apache/catalina/startup/TesterServletEncodeUrl.java b/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
index 3f09404..895e5bb 100644
--- a/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
+++ b/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
@@ -32,6 +32,13 @@ public class TesterServletEncodeUrl extends HttpServlet {
private static final long serialVersionUID = 1L;
+ /**
+ * Almost minimal processing for a servlet.
+ * <p>
+ * The request parameter <code>nextUrl</code> specifies the url to which the
+ * caller would like to go next. If supplied, put an encoded url into the
+ * returned html page as a hyperlink.
+ */
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/05: Update reference to migrated wiki content
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b1d97e31ab06d2d3e60643004530e52373d056ca
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 2 18:41:22 2019 +0100
Update reference to migrated wiki content
---
build.properties.default | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 0d2ced9..7ba9134 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -123,7 +123,7 @@ wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar
# ----- Eclipse JDT, version 4.7 or later -----#
-# See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
+# See https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
# Checksum is from "SHA512 Checksums for 4.10" link at
# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/05: Update Tomcat Native to 1.2.23
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f47e1c7e94f6a4c18a45ee1f23a9f23853983e82
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 2 18:46:52 2019 +0100
Update Tomcat Native to 1.2.23
---
build.properties.default | 10 +++++-----
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
webapps/docs/changelog.xml | 3 +++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 7ba9134..04addd7 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -141,19 +141,19 @@ jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# ----- Tomcat native library -----
-tomcat-native.version=1.2.21
+tomcat-native.version=1.2.23
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=7f43f815785e5bc3e43f5b2e9ad1c90576a3c1528d57230328b7175bf475eb5f4e1f91b66fae74ad32cd76f044d7705f98a79109f6f84e5af75dc32bc8830b29
+tomcat-native.src.checksum.value=89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=bd5e7bb6584cba635d780216b87d453ecca5034235f018ba8a7429b82d653aa58cf26b89520c60271e10f242bd8a10fce401f362ecfe0fab597c7b6983ad97ce
+tomcat-native.win.checksum.value=b5d91d709241fea5f18fbaf2eb1dbad3c3014309ac72dfc10c0eb7c2f926a8e37a4c326ce251552bbd2b1f15b86c84ae72c33a259cc051765ab4322c91b5721b
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1a-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1a-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1c-win32-bin.zip
# ----- NSIS, version 3.0 or later -----
nsis.version=3.04
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index 671a0a9..0bde68c 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -68,7 +68,7 @@ public class AprLifecycleListener
protected static final int TCN_REQUIRED_MINOR = 2;
protected static final int TCN_REQUIRED_PATCH = 14;
protected static final int TCN_RECOMMENDED_MINOR = 2;
- protected static final int TCN_RECOMMENDED_PV = 21;
+ protected static final int TCN_RECOMMENDED_PV = 23;
// ---------------------------------------------- Properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bcce219..1b9d5bb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -68,6 +68,9 @@
<fix>
Improve parsing of Content-Range headers. (markt)
</fix>
+ <update>
+ Update the recommended minimum Tomcat Native version to 1.2.23. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/05: Remove Gump debug code
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 174231483eb572cacb5b79944ee60ea5b6ddf715
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 2 21:03:40 2019 +0100
Remove Gump debug code
---
test/javax/el/TestImportHandlerStandardPackages.java | 2 --
1 file changed, 2 deletions(-)
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java b/test/javax/el/TestImportHandlerStandardPackages.java
index 0c2c92f..cd4e64e 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -96,8 +96,6 @@ public class TestImportHandlerStandardPackages {
Enumeration<URL> resources = cl.getResources(path);
while (resources.hasMoreElements()) {
URL resource = resources.nextElement();
- // Debugging for Gump failure
- System.out.println("Scanning: [" + resource + "]");
URI uri = resource.toURI();
// Gump includes some JARs on classpath - skip them
if (!"file".equals(uri.getScheme())) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/05: Update Eclipse compiler to 4.12 (a.k.a 3.18.0)
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a57b1fb17ed6c5e62daadfcff04dbbbc24ca4823
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jul 2 19:02:05 2019 +0100
Update Eclipse compiler to 4.12 (a.k.a 3.18.0)
---
build.properties.default | 6 +++---
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 2 +-
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 2 +-
res/maven/tomcat-embed-jasper.pom | 2 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 3 +++
8 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 04addd7..230d8c4 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,11 +129,11 @@ wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/
# http://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/checksum/eclipse-4.10-SUMSSHA512
#
-jdt.version=4.10
-jdt.release=R-4.10-201812060815
+jdt.version=4.12
+jdt.release=R-4.12-201906051800/
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=6528d1933d752f909e61456f1a3cbb3ae3999d263701a459e6f4fc33f97f793ec0cfbe7a6408b02bd67deb8ec9371659d54e33216d8075f779579df614465753
+jdt.checksum.value=7d38921ae374a5112e7ed5596d85955b608ddf74849373d7a74b199961514807e749d8c8cad89871fa1fdd5e14bc6ec471665546a9f8d313da5c963589c307b0
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking care of that in advance.
diff --git a/res/ide-support/eclipse/eclipse.classpath b/res/ide-support/eclipse/eclipse.classpath
index b76f4c8..e5c20dd 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar"/>
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/wsdl4j-1.6.3/wsdl4j-1.6.3.jar"/>
- <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.10/ecj-4.10.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.12/ecj-4.12.jar"/>
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/hamcrest-1.3/hamcrest-core-1.3.jar"/>
<classpathentry kind="var" path="TOMCAT_LIBS_BASE/cglib-2.2.2/cglib-nodep-2.2.2.jar"/>
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 66aaaeb..0d63edc 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -70,7 +70,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.10/ecj-4.10.jar!/" />
+ <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.12/ecj-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties b/res/ide-support/netbeans/nb-tomcat-build.properties
index 2fee6c4..fa28089 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
# it is not possible to retrieve the classpaths from the build to
# use in the NetBeans targets, so they must be explicitly declared
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.10/ecj-4.10.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.11/junit-4.11.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar:${base.path}/ecj-4.12/ecj-4.12.jar:${tomcat.classes}
# Extra properties used by the Tomcat project additional NetBeans targets.
diff --git a/res/ide-support/netbeans/project.xml b/res/ide-support/netbeans/project.xml
index 341a5d2..850006b 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
-->
<compilation-unit>
<package-root>java</package-root>
- <classpath mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.10/ecj-4.10.jar:${ant.includes}/</classpath>
+ <classpath mode="compile">${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.12/ecj-4.12.jar:${ant.includes}/</classpath>
<source-level>1.7</source-level>
</compilation-unit>
<compilation-unit>
diff --git a/res/maven/tomcat-embed-jasper.pom b/res/maven/tomcat-embed-jasper.pom
index eab1a05..5c0ab05 100644
--- a/res/maven/tomcat-embed-jasper.pom
+++ b/res/maven/tomcat-embed-jasper.pom
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>3.16.0</version>
+ <version>3.18.0</version>
</dependency>
</dependencies>
</project>
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 96e9f35..d6bf9579 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
- <version>3.16.0</version>
+ <version>3.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1b9d5bb..e7520fd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -100,6 +100,9 @@
Include file names if SMAP processor is unable to delete or rename a
class file during SMAP generation. (markt)
</add>
+ <update>
+ Update to the Eclipse JDT compiler 4.12. (markt)
+ </update>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org