Attachment 32133 Details for Bug 57123 – 2014-10-21_tc8_57123_ecj441.patch

[patch] 2014-10-21_tc8_57123_ecj441.patch

2014-10-21_tc8_57123_ecj441.patch (text/plain), 4.25 KB, created by Konstantin Kolinko on 2014-10-21 17:51:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2014-10-21 17:51:49 UTC

Size: 4.25 KB

patch

obsolete

>Index: build.properties.default
>===================================================================
>--- build.properties.default	(revision 1633343)
>+++ build.properties.default	(working copy)
>@@ -137,8 +137,8 @@
> 
> # ----- Eclipse JDT, version 4.4 or later -----#
> # See https://wiki.apache.org/tomcat/JDTCoreBatchCompiler before updating
>-jdt.version=4.4
>-jdt.release=R-4.4-201406061215
>+jdt.version=4.4.1
>+jdt.release=R-4.4.1-201409250400
> 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.
>Index: res/ide-support/eclipse/eclipse.classpath
>===================================================================
>--- res/ide-support/eclipse/eclipse.classpath	(revision 1633343)
>+++ res/ide-support/eclipse/eclipse.classpath	(working copy)
>@@ -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/ecj-4.4.jar"/>
>+    <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.4.1/ecj-4.4.1.jar"/>
>     <classpathentry kind="var" path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
>     <classpathentry kind="output" path=".settings/output"/>
> </classpath>
>Index: res/ide-support/netbeans/nb-tomcat-build.properties
>===================================================================
>--- res/ide-support/netbeans/nb-tomcat-build.properties	(revision 1633343)
>+++ res/ide-support/netbeans/nb-tomcat-build.properties	(working copy)
>@@ -37,7 +37,7 @@
> # 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/ecj-4.4.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.4.1/ecj-4.4.1.jar:${tomcat.classes}
> 
> # Extra properties used by the Tomcat project additional NetBeans targets.
> 
>Index: res/ide-support/netbeans/project.xml
>===================================================================
>--- res/ide-support/netbeans/project.xml	(revision 1633343)
>+++ res/ide-support/netbeans/project.xml	(working copy)
>@@ -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/ecj-4.4.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.4.1/ecj-4.4.1.jar:${ant.includes}/</classpath>
>                 <source-level>1.7</source-level>
>             </compilation-unit>
>             <compilation-unit>
>Index: res/maven/tomcat-embed-jasper.pom
>===================================================================
>--- res/maven/tomcat-embed-jasper.pom	(revision 1633343)
>+++ res/maven/tomcat-embed-jasper.pom	(working copy)
>@@ -45,7 +45,7 @@
>     <dependency>
>       <groupId>org.eclipse.jdt.core.compiler</groupId>
>       <artifactId>ecj</artifactId>
>-      <version>4.4</version>
>+      <version>4.4.1</version>
>     </dependency>
>   </dependencies>
> </project>
>Index: res/maven/tomcat-jasper.pom
>===================================================================
>--- res/maven/tomcat-jasper.pom	(revision 1633343)
>+++ res/maven/tomcat-jasper.pom	(working copy)
>@@ -57,7 +57,7 @@
>     <dependency>
>       <groupId>org.eclipse.jdt.core.compiler</groupId>
>       <artifactId>ecj</artifactId>
>-      <version>4.4</version>
>+      <version>4.4.1</version>
>     </dependency>
>     <dependency>
>       <groupId>org.apache.tomcat</groupId>

Actions: View | Diff

Attachments on bug 57123: 32133