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
The following commit(s) were added to refs/heads/master by this push:
new fc1891b Update Eclipse JDT compiler to 4.13
fc1891b is described below
commit fc1891bbc865bfc489b110fe1f41e010e811e11c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Sep 24 19:08:32 2019 +0100
Update Eclipse JDT compiler to 4.13
---
build.properties.default | 12 ++++++------
res/ide-support/eclipse/eclipse.classpath | 2 +-
res/ide-support/idea/tomcat.iml | 4 ++--
res/ide-support/netbeans/nb-tomcat-build.properties | 2 +-
res/ide-support/netbeans/project.xml | 4 ++--
webapps/docs/changelog.xml | 7 +++++++
6 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index c9a3625..c3c7d60 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# ----- Eclipse JDT, version 4.7 or later -----#
# 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.12" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/
-#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.12-201906051800/checksum/eclipse-4.12-SUMSSHA512
+# Checksum is from "SHA512 Checksums for 4.13" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/
+#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/checksum/eclipse-4.13-SUMSSHA512
#
-jdt.version=4.12
-jdt.release=R-4.12-201906051800/
+jdt.version=4.13
+jdt.release=R-4.13-201909161045/
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=7d38921ae374a5112e7ed5596d85955b608ddf74849373d7a74b199961514807e749d8c8cad89871fa1fdd5e14bc6ec471665546a9f8d313da5c963589c307b0
+jdt.checksum.value=d608e4b7fc9b061e327ad5c39112c032e310a48c57ddd01c9349f2be8f5ce4d3d0c3862b6b5cc105220a06a6dd62c477de654b9fbe6f4c8a3d3de816e5de19f7
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 e5c20dd..c038e17 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.12/ecj-4.12.jar"/>
+ <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.13/ecj-4.13.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 0d63edc..4973d0a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -30,7 +30,7 @@
<orderEntry type="module-library">
<library name="junit4">
<CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
+ <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.13.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -70,7 +70,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.12/ecj-4.12.jar!/" />
+ <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.13/ecj-4.13.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 fa28089..c6c66fa 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.12/ecj-4.12.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.13/ecj-4.13.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 850006b..8cb521e 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.12/ecj-4.12.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.13/ecj-4.13.jar:${ant.includes}/</classpath>
<source-level>1.7</source-level>
</compilation-unit>
<compilation-unit>
@@ -189,7 +189,7 @@
<compilation-unit>
<package-root>test</package-root>
<unit-tests/>
- <classpath
mode="compile">output/classes:output/testclasses:${base.path}/junit-4.12/junit-4.12.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar</classpath>
+ <classpath
mode="compile">output/classes:output/testclasses:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-3.2/easymock-3.2.jar:${base.path}/hamcrest-1.3/hamcrest-core-1.3.jar</classpath>
<source-level>1.7</source-level>
</compilation-unit>
</java-data>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bd501d2..63e4b12 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -58,6 +58,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <update>
+ Update to the Eclipse JDT compiler 4.13. (markt)
+ </update>
+ </changelog>
+ </subsection>
<subsection name="Web Socket">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
