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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org