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 2018/11/19 09:31:14 UTC

svn commit: r1846889 - in /tomcat/trunk: res/ide-support/eclipse/eclipse.classpath res/ide-support/idea/tomcat.iml res/ide-support/netbeans/nb-tomcat-build.properties res/ide-support/netbeans/project.xml webapps/docs/changelog.xml

Author: markt
Date: Mon Nov 19 09:31:14 2018
New Revision: 1846889

URL: http://svn.apache.org/viewvc?rev=1846889&view=rev
Log:
Update ECJ dependency in IDE support files.
Patch provided by Lukasz Jader
This closes #133

Modified:
    tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
    tomcat/trunk/res/ide-support/idea/tomcat.iml
    tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties
    tomcat/trunk/res/ide-support/netbeans/project.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/res/ide-support/eclipse/eclipse.classpath
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1846889&r1=1846888&r2=1846889&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/trunk/res/ide-support/eclipse/eclipse.classpath Mon Nov 19 09:31:14 2018
@@ -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.7.3a/ecj-4.7.3a.jar"/>
+    <classpathentry kind="var" path="TOMCAT_LIBS_BASE/ecj-4.9/ecj-4.9.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"/>

Modified: tomcat/trunk/res/ide-support/idea/tomcat.iml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/idea/tomcat.iml?rev=1846889&r1=1846888&r2=1846889&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/idea/tomcat.iml (original)
+++ tomcat/trunk/res/ide-support/idea/tomcat.iml Mon Nov 19 09:31:14 2018
@@ -70,7 +70,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.7.3a/ecj-4.7.3a.jar!/" />
+          <root url="jar://$TOMCAT_BUILD_LIBS$/ecj-4.9/ecj-4.9.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

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=1846889&r1=1846888&r2=1846889&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties (original)
+++ tomcat/trunk/res/ide-support/netbeans/nb-tomcat-build.properties Mon Nov 19 09:31:14 2018
@@ -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.7.3a/ecj-4.7.3a.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.9/ecj-4.9.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=1846889&r1=1846888&r2=1846889&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/netbeans/project.xml (original)
+++ tomcat/trunk/res/ide-support/netbeans/project.xml Mon Nov 19 09:31:14 2018
@@ -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.7.3a/ecj-4.7.3a.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.9/ecj-4.9.jar:${ant.includes}/</classpath>
                 <source-level>1.7</source-level>
             </compilation-unit>
             <compilation-unit>

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846889&r1=1846888&r2=1846889&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Nov 19 09:31:14 2018
@@ -129,7 +129,8 @@
   <subsection name="Jasper">
     <changelog>
       <update>
-        Update the Eclipse Compiler for Java to 4.9. (markt)
+        Update the Eclipse Compiler for Java to 4.9. Additional patch by Lukasz
+        Jader. (markt)
       </update>
     </changelog>
   </subsection>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org