Author: markt Date: Mon Jul 27 15:13:17 2015 New Revision: 1692894 URL: http://svn.apache.org/r1692894 Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58111 Update to Eclipse 4.5
Modified: tomcat/trunk/build.properties.default tomcat/trunk/res/ide-support/eclipse/eclipse.classpath tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties tomcat/trunk/res/ide-support/netbeans/project.xml tomcat/trunk/res/maven/tomcat-embed-jasper.pom tomcat/trunk/res/maven/tomcat-jasper.pom Modified: tomcat/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1692894&r1=1692893&r2=1692894&view=diff ============================================================================== --- tomcat/trunk/build.properties.default (original) +++ tomcat/trunk/build.properties.default Mon Jul 27 15:13:17 2015 @@ -138,10 +138,10 @@ wsdl4j-lib.home=${base.path}/wsdl4j-${ws wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${wsdl4j-lib.version}.jar wsdl4j-lib.jar=${wsdl4j-lib.home}/wsdl4j-${wsdl4j-lib.version}.jar -# ----- Eclipse JDT, version 4.4 or later -----# +# ----- Eclipse JDT, version 4.5 or later -----# # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating -jdt.version=4.4.2 -jdt.release=R-4.4.2-201502041700 +jdt.version=4.5 +jdt.release=R-4.5-201506032000 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. Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath URL: http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1692894&r1=1692893&r2=1692894&view=diff ============================================================================== --- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original) +++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Mon Jul 27 15:13:17 2015 @@ -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.2/wsdl4j-1.6.2.jar"/> - <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.4.2/ecj-4.4.2.jar"/> + <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.5/ecj-4.5.jar"/> <classpathentry kind="var" path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/> <classpathentry kind="output" path=".settings/output"/> </classpath> Modified: tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties?rev=1692894&r1=1692893&r2=1692894&view=diff ============================================================================== --- tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties (original) +++ tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties Mon Jul 27 15:13:17 2015 @@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http # 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.4.2/ecj-4.4.2.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.5/ecj-4.5.jar:${tomcat.classes} # Extra properties used by the Tomcat project additional NetBeans targets. Modified: tomcat/trunk/res/ide-support/netbeans/project.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/netbeans/project.xml?rev=1692894&r1=1692893&r2=1692894&view=diff ============================================================================== --- tomcat/trunk/res/ide-support/netbeans/project.xml (original) +++ tomcat/trunk/res/ide-support/netbeans/project.xml Mon Jul 27 15:13:17 2015 @@ -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.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.4.2/ecj-4.4.2.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.2/wsdl4j-1.6.2.jar:${base.path}/ecj-4.5/ecj-4.5.jar:${ant.includes}/</classpath> <source-level>1.7</source-level> </compilation-unit> <compilation-unit> Modified: tomcat/trunk/res/maven/tomcat-embed-jasper.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-jasper.pom?rev=1692894&r1=1692893&r2=1692894&view=diff ============================================================================== --- tomcat/trunk/res/maven/tomcat-embed-jasper.pom (original) +++ tomcat/trunk/res/maven/tomcat-embed-jasper.pom Mon Jul 27 15:13:17 2015 @@ -45,7 +45,7 @@ <dependency> <groupId>org.eclipse.jdt.core.compiler</groupId> <artifactId>ecj</artifactId> - <version>4.4.2</version> + <version>4.5</version> </dependency> </dependencies> </project> Modified: tomcat/trunk/res/maven/tomcat-jasper.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1692894&r1=1692893&r2=1692894&view=diff ============================================================================== --- tomcat/trunk/res/maven/tomcat-jasper.pom (original) +++ tomcat/trunk/res/maven/tomcat-jasper.pom Mon Jul 27 15:13:17 2015 @@ -57,7 +57,7 @@ <dependency> <groupId>org.eclipse.jdt.core.compiler</groupId> <artifactId>ecj</artifactId> - <version>4.4.2</version> + <version>4.5</version> </dependency> <dependency> <groupId>org.apache.tomcat</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org