Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
Locked
Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
 
Administrator
|
There are still references to ant-nodeps though it's not there anymore, what should be the status? (I was tempted to remove references...)
Jacques Le 24/06/2014 22:30, [hidden email] a écrit : > Author: doogie > Date: Tue Jun 24 20:30:26 2014 > New Revision: 1605178 > > URL: http://svn.apache.org/r1605178 > Log: > Revert "Fix Eclipse classpath file." > > This reverts commit 823b2d691f2d688153c13b7d87aea35a17f23ef0. > > Modified: > ofbiz/trunk/.classpath > > Modified: ofbiz/trunk/.classpath > URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1605178&r1=1605177&r2=1605178&view=diff > ============================================================================== > --- ofbiz/trunk/.classpath (original) > +++ ofbiz/trunk/.classpath Tue Jun 24 20:30:26 2014 > @@ -10,10 +10,11 @@ > <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> > <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> > <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> > - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant.jar"/> > - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-junit.jar"/> > - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-launcher.jar"/> > - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> > + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant.jar"/> > + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-junit.jar"/> > + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/> > + <classpathentry kind="lib" path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> > + <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> > <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> > <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> > <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> > > > |
Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
|
According to this:
http://archive.apache.org/dist/ant/RELEASE-NOTES-apache-ant-1.8.2.html and specifically to: "* Removed ant-nodeps.jar; it is now merged into ant.jar." and considering that we are running ant 1.9, I don't think we ahould keep any reference to ant-nodeps. Jacopo On Jul 20, 2014, at 10:14 AM, Jacques Le Roux <[hidden email]> wrote: > There are still references to ant-nodeps though it's not there anymore, what should be the status? (I was tempted to remove references...) > > Jacques > > Le 24/06/2014 22:30, [hidden email] a écrit : >> Author: doogie >> Date: Tue Jun 24 20:30:26 2014 >> New Revision: 1605178 >> >> URL: http://svn.apache.org/r1605178 >> Log: >> Revert "Fix Eclipse classpath file." >> >> This reverts commit 823b2d691f2d688153c13b7d87aea35a17f23ef0. >> >> Modified: >> ofbiz/trunk/.classpath >> >> Modified: ofbiz/trunk/.classpath >> URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1605178&r1=1605177&r2=1605178&view=diff >> ============================================================================== >> --- ofbiz/trunk/.classpath (original) >> +++ ofbiz/trunk/.classpath Tue Jun 24 20:30:26 2014 >> @@ -10,10 +10,11 @@ >> <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> >> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> >> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> >> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant.jar"/> >> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-junit.jar"/> >> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-launcher.jar"/> >> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant.jar"/> >> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-junit.jar"/> >> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/> >> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> >> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> >> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> >> <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> >> >> >> |
Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
|
Administrator
|
For now see http://svn.apache.org/viewvc?view=revision&revision=r1612053
W/o answers from Adam, I think we can also remove in macros.xml Le 20/07/2014 12:26, Jacopo Cappellato a écrit : > According to this: > > http://archive.apache.org/dist/ant/RELEASE-NOTES-apache-ant-1.8.2.html > > and specifically to: > > "* Removed ant-nodeps.jar; it is now merged into ant.jar." > > and considering that we are running ant 1.9, I don't think we ahould keep any reference to ant-nodeps. > > Jacopo > > > > On Jul 20, 2014, at 10:14 AM, Jacques Le Roux <[hidden email]> wrote: > >> There are still references to ant-nodeps though it's not there anymore, what should be the status? (I was tempted to remove references...) >> >> Jacques >> >> Le 24/06/2014 22:30, [hidden email] a écrit : >>> Author: doogie >>> Date: Tue Jun 24 20:30:26 2014 >>> New Revision: 1605178 >>> >>> URL: http://svn.apache.org/r1605178 >>> Log: >>> Revert "Fix Eclipse classpath file." >>> >>> This reverts commit 823b2d691f2d688153c13b7d87aea35a17f23ef0. >>> >>> Modified: >>> ofbiz/trunk/.classpath >>> >>> Modified: ofbiz/trunk/.classpath >>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1605178&r1=1605177&r2=1605178&view=diff >>> ============================================================================== >>> --- ofbiz/trunk/.classpath (original) >>> +++ ofbiz/trunk/.classpath Tue Jun 24 20:30:26 2014 >>> @@ -10,10 +10,11 @@ >>> <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> >>> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> >>> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> >>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant.jar"/> >>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-junit.jar"/> >>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-launcher.jar"/> >>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant.jar"/> >>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-junit.jar"/> >>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/> >>> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> >>> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> >>> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> >>> <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> >>> >>> >>> > > |
Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
|
|
I may be wrong but I think that according to this:
https://ant.apache.org/manual/Tasks/javacc.html https://ant.apache.org/manual/Tasks/jjtree.html we do not need to explicitly define the following two taskdef: <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> because they are now available in the core ant distro. Jacopo On Jul 20, 2014, at 1:19 PM, Jacques Le Roux <[hidden email]> wrote: > For now see http://svn.apache.org/viewvc?view=revision&revision=r1612053 > W/o answers from Adam, I think we can also remove in macros.xml > > Le 20/07/2014 12:26, Jacopo Cappellato a écrit : >> According to this: >> >> http://archive.apache.org/dist/ant/RELEASE-NOTES-apache-ant-1.8.2.html >> >> and specifically to: >> >> "* Removed ant-nodeps.jar; it is now merged into ant.jar." >> >> and considering that we are running ant 1.9, I don't think we ahould keep any reference to ant-nodeps. >> >> Jacopo >> >> >> >> On Jul 20, 2014, at 10:14 AM, Jacques Le Roux <[hidden email]> wrote: >> >>> There are still references to ant-nodeps though it's not there anymore, what should be the status? (I was tempted to remove references...) >>> >>> Jacques >>> >>> Le 24/06/2014 22:30, [hidden email] a écrit : >>>> Author: doogie >>>> Date: Tue Jun 24 20:30:26 2014 >>>> New Revision: 1605178 >>>> >>>> URL: http://svn.apache.org/r1605178 >>>> Log: >>>> Revert "Fix Eclipse classpath file." >>>> >>>> This reverts commit 823b2d691f2d688153c13b7d87aea35a17f23ef0. >>>> >>>> Modified: >>>> ofbiz/trunk/.classpath >>>> >>>> Modified: ofbiz/trunk/.classpath >>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1605178&r1=1605177&r2=1605178&view=diff >>>> ============================================================================== >>>> --- ofbiz/trunk/.classpath (original) >>>> +++ ofbiz/trunk/.classpath Tue Jun 24 20:30:26 2014 >>>> @@ -10,10 +10,11 @@ >>>> <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> >>>> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> >>>> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> >>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant.jar"/> >>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-junit.jar"/> >>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-launcher.jar"/> >>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant.jar"/> >>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-junit.jar"/> >>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/> >>>> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>>> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> >>>> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> >>>> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> >>>> <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> >>>> >>>> >>>> >> >> |
Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
|
Administrator
|
I think you 3 references are quite clear, we can get rid of those 3!
Jacques Le 20/07/2014 17:22, Jacopo Cappellato a écrit : > I may be wrong but I think that according to this: > > https://ant.apache.org/manual/Tasks/javacc.html > https://ant.apache.org/manual/Tasks/jjtree.html > > we do not need to explicitly define the following two taskdef: > > <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> > <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> > > because they are now available in the core ant distro. > > Jacopo > > > On Jul 20, 2014, at 1:19 PM, Jacques Le Roux <[hidden email]> wrote: > >> For now see http://svn.apache.org/viewvc?view=revision&revision=r1612053 >> W/o answers from Adam, I think we can also remove in macros.xml >> >> Le 20/07/2014 12:26, Jacopo Cappellato a écrit : >>> According to this: >>> >>> http://archive.apache.org/dist/ant/RELEASE-NOTES-apache-ant-1.8.2.html >>> >>> and specifically to: >>> >>> "* Removed ant-nodeps.jar; it is now merged into ant.jar." >>> >>> and considering that we are running ant 1.9, I don't think we ahould keep any reference to ant-nodeps. >>> >>> Jacopo >>> >>> >>> >>> On Jul 20, 2014, at 10:14 AM, Jacques Le Roux <[hidden email]> wrote: >>> >>>> There are still references to ant-nodeps though it's not there anymore, what should be the status? (I was tempted to remove references...) >>>> >>>> Jacques >>>> >>>> Le 24/06/2014 22:30, [hidden email] a écrit : >>>>> Author: doogie >>>>> Date: Tue Jun 24 20:30:26 2014 >>>>> New Revision: 1605178 >>>>> >>>>> URL: http://svn.apache.org/r1605178 >>>>> Log: >>>>> Revert "Fix Eclipse classpath file." >>>>> >>>>> This reverts commit 823b2d691f2d688153c13b7d87aea35a17f23ef0. >>>>> >>>>> Modified: >>>>> ofbiz/trunk/.classpath >>>>> >>>>> Modified: ofbiz/trunk/.classpath >>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1605178&r1=1605177&r2=1605178&view=diff >>>>> ============================================================================== >>>>> --- ofbiz/trunk/.classpath (original) >>>>> +++ ofbiz/trunk/.classpath Tue Jun 24 20:30:26 2014 >>>>> @@ -10,10 +10,11 @@ >>>>> <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> >>>>> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> >>>>> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> >>>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant.jar"/> >>>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-junit.jar"/> >>>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-launcher.jar"/> >>>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant.jar"/> >>>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-junit.jar"/> >>>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/> >>>>> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>>>> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> >>>>> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> >>>>> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> >>>>> <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> >>>>> >>>>> >>>>> >>> > > |
Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
|
|
If you are going to work on this, please consider the following patch with some enhancements and cleanup for the macros.xml file.
Thanks, Jacopo Index: macros.xml =================================================================== --- macros.xml (revision 1612100) +++ macros.xml (working copy) @@ -18,17 +18,17 @@ under the License. --> <project name="Ant - Macros"> - <condition property="antatleast171"> - <antversion atleast="1.7.1"/> - </condition> - <fail unless="antatleast171" message="Please upgrade ant to at least 1.7.1"/> + <property name="minimumantversion" value="1.9.0"/> + <antversion property="antversion" atleast="${minimumantversion}"/> + <fail unless="antversion" message="Please upgrade ant to at least ${minimumantversion}. Current ant version is ${ant.version}"/> + <condition property="javaatleast17"> <not> <matches pattern="^1\.[0-6]($|\..*)" string="${ant.java.version}"/> </not> </condition> - <fail unless="javaatleast17" message="Please upgrade java to at least 1.7"/> + <fail unless="javaatleast17" message="Please upgrade java to at least 1.7. Current Java version is ${ant.java.version}"/> <dirname property="ofbiz.home.dir" file="${ant.file.Ant - Macros}"/> <macrodef name="iterate"> @@ -56,9 +56,6 @@ <path id="rhino.class.path"> <pathelement location="${ofbiz.home.dir}/extension/rhino/lib/js-1.7.R1.jar"/> </path> - <path id="ant.lib.class.path"> - <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> - </path> <path id="junit.class.path"> <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting/" includes="*.jar"/> <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/> @@ -191,14 +188,11 @@ </classpath> </groovyc> </presetdef> - <taskdef resource="net/sf/antcontrib/antlib.xml"> <classpath> <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-contrib-1.0b3.jar"/> </classpath> </taskdef> - <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> - <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> <macrodef name="ofbiz-javacc"> <attribute name="dir"/> <attribute name="file"/> @@ -226,39 +220,6 @@ </sequential> </macrodef> - <macrodef name="ofbiz-jjtree"> - <attribute name="dir"/> - <attribute name="file"/> - <attribute name="prefix" default=""/> - <sequential> - <if> - <not> - <uptodate - srcfile="@{prefix}src/@{dir}/@{file}.jjt" - targetfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"/> - </not> - <delete dir="@{prefix}build/gen-src/jjtree/@{dir}"/> - <mkdir dir="@{prefix}build/gen-src/jjtree/@{dir}"/> - <jjtree target="@{prefix}src/@{dir}/@{file}.jjt" - javacchome="${ofbiz.home.dir}/lib/build/javacc" - outputdirectory="@{prefix}build/gen-src/jjtree/@{dir}"/> - </if> - <if> - <not> - <uptodate - srcfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj" - targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/> - </not> - <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/> - <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/> - <javacc target="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj" - javacchome="${ofbiz.home.dir}/lib/build/javacc" - outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/> - <delete dir="@{prefix}build/classes/@{dir}"/> - </if> - </sequential> - </macrodef> - <presetdef name="externalsubant"> <subant inheritall="false"> <propertyset> On Jul 20, 2014, at 8:37 PM, Jacques Le Roux <[hidden email]> wrote: > I think you 3 references are quite clear, we can get rid of those 3! > > Jacques > > Le 20/07/2014 17:22, Jacopo Cappellato a écrit : >> I may be wrong but I think that according to this: >> >> https://ant.apache.org/manual/Tasks/javacc.html >> https://ant.apache.org/manual/Tasks/jjtree.html >> >> we do not need to explicitly define the following two taskdef: >> >> <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> >> <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> >> >> because they are now available in the core ant distro. >> >> Jacopo >> >> >> On Jul 20, 2014, at 1:19 PM, Jacques Le Roux <[hidden email]> wrote: >> >>> For now see http://svn.apache.org/viewvc?view=revision&revision=r1612053 >>> W/o answers from Adam, I think we can also remove in macros.xml >>> >>> Le 20/07/2014 12:26, Jacopo Cappellato a écrit : >>>> According to this: >>>> >>>> http://archive.apache.org/dist/ant/RELEASE-NOTES-apache-ant-1.8.2.html >>>> >>>> and specifically to: >>>> >>>> "* Removed ant-nodeps.jar; it is now merged into ant.jar." >>>> >>>> and considering that we are running ant 1.9, I don't think we ahould keep any reference to ant-nodeps. >>>> >>>> Jacopo >>>> >>>> >>>> >>>> On Jul 20, 2014, at 10:14 AM, Jacques Le Roux <[hidden email]> wrote: >>>> >>>>> There are still references to ant-nodeps though it's not there anymore, what should be the status? (I was tempted to remove references...) >>>>> >>>>> Jacques >>>>> >>>>> Le 24/06/2014 22:30, [hidden email] a écrit : >>>>>> Author: doogie >>>>>> Date: Tue Jun 24 20:30:26 2014 >>>>>> New Revision: 1605178 >>>>>> >>>>>> URL: http://svn.apache.org/r1605178 >>>>>> Log: >>>>>> Revert "Fix Eclipse classpath file." >>>>>> >>>>>> This reverts commit 823b2d691f2d688153c13b7d87aea35a17f23ef0. >>>>>> >>>>>> Modified: >>>>>> ofbiz/trunk/.classpath >>>>>> >>>>>> Modified: ofbiz/trunk/.classpath >>>>>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1605178&r1=1605177&r2=1605178&view=diff >>>>>> ============================================================================== >>>>>> --- ofbiz/trunk/.classpath (original) >>>>>> +++ ofbiz/trunk/.classpath Tue Jun 24 20:30:26 2014 >>>>>> @@ -10,10 +10,11 @@ >>>>>> <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/> >>>>>> <classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/> >>>>>> <classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/> >>>>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant.jar"/> >>>>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-junit.jar"/> >>>>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-launcher.jar"/> >>>>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>>>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant.jar"/> >>>>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-junit.jar"/> >>>>>> + <classpathentry kind="lib" path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/> >>>>>> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>>>>> + <classpathentry kind="lib" path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> >>>>>> <classpathentry kind="lib" path="framework/base/lib/antisamy-bin.1.2.jar"/> >>>>>> <classpathentry kind="lib" path="framework/base/lib/avalon-framework-4.2.0.jar"/> >>>>>> <classpathentry kind="lib" path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> >>>>>> >>>>>> >>>>>> >>>> >> >> |
Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
|
|
In reply to this post by Jacques Le Roux
Go ahead.
On 07/20/2014 06:19 AM, Jacques Le Roux wrote: > For now see http://svn.apache.org/viewvc?view=revision&revision=r1612053 > W/o answers from Adam, I think we can also remove in macros.xml > > Le 20/07/2014 12:26, Jacopo Cappellato a écrit : >> According to this: >> >> http://archive.apache.org/dist/ant/RELEASE-NOTES-apache-ant-1.8.2.html >> >> and specifically to: >> >> "* Removed ant-nodeps.jar; it is now merged into ant.jar." >> >> and considering that we are running ant 1.9, I don't think we ahould >> keep any reference to ant-nodeps. >> >> Jacopo >> >> >> >> On Jul 20, 2014, at 10:14 AM, Jacques Le Roux >> <[hidden email]> wrote: >> >>> There are still references to ant-nodeps though it's not there >>> anymore, what should be the status? (I was tempted to remove >>> references...) >>> >>> Jacques >>> >>> Le 24/06/2014 22:30, [hidden email] a écrit : >>>> Author: doogie >>>> Date: Tue Jun 24 20:30:26 2014 >>>> New Revision: 1605178 >>>> >>>> URL: http://svn.apache.org/r1605178 >>>> Log: >>>> Revert "Fix Eclipse classpath file." >>>> >>>> This reverts commit 823b2d691f2d688153c13b7d87aea35a17f23ef0. >>>> >>>> Modified: >>>> ofbiz/trunk/.classpath >>>> >>>> Modified: ofbiz/trunk/.classpath >>>> URL: >>>> http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1605178&r1=1605177&r2=1605178&view=diff >>>> ============================================================================== >>>> >>>> --- ofbiz/trunk/.classpath (original) >>>> +++ ofbiz/trunk/.classpath Tue Jun 24 20:30:26 2014 >>>> @@ -10,10 +10,11 @@ >>>> <classpathentry kind="lib" >>>> path="applications/content/lib/tika-parsers-1.0.jar"/> >>>> <classpathentry kind="lib" >>>> path="applications/product/lib/watermarker-0.0.4.jar"/> >>>> <classpathentry kind="lib" >>>> path="applications/product/lib/dozer-4.2.1.jar"/> >>>> - <classpathentry kind="lib" path="lib/ant/ant-1.9.0-ant.jar"/> >>>> - <classpathentry kind="lib" >>>> path="lib/ant/ant-1.9.0-ant-junit.jar"/> >>>> - <classpathentry kind="lib" >>>> path="lib/ant/ant-1.9.0-ant-launcher.jar"/> >>>> - <classpathentry kind="lib" >>>> path="lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>>> + <classpathentry kind="lib" >>>> path="framework/base/lib/ant-1.9.0-ant.jar"/> >>>> + <classpathentry kind="lib" >>>> path="framework/base/lib/ant-1.9.0-ant-junit.jar"/> >>>> + <classpathentry kind="lib" >>>> path="framework/base/lib/ant-1.9.0-ant-launcher.jar"/> >>>> + <classpathentry kind="lib" >>>> path="framework/base/lib/ant/ant-1.9.0-ant-apache-bsf.jar"/> >>>> + <classpathentry kind="lib" >>>> path="framework/base/lib/ant/ant-nodeps-1.8.1.jar"/> >>>> <classpathentry kind="lib" >>>> path="framework/base/lib/antisamy-bin.1.2.jar"/> >>>> <classpathentry kind="lib" >>>> path="framework/base/lib/avalon-framework-4.2.0.jar"/> >>>> <classpathentry kind="lib" >>>> path="framework/base/lib/avalon-util-exception-1.0.0.jar"/> >>>> >>>> >>>> >> >> |
Re: svn commit: r1605178 - /ofbiz/trunk/.classpath
|
Administrator
|
In reply to this post by Jacopo Cappellato-4
Done at revision: 1612474
Jacques Le 21/07/2014 09:56, Jacopo Cappellato a écrit : > Index: macros.xml > =================================================================== > --- macros.xml (revision 1612100) > +++ macros.xml (working copy) > @@ -18,17 +18,17 @@ > under the License. > --> > <project name="Ant - Macros"> > - <condition property="antatleast171"> > - <antversion atleast="1.7.1"/> > - </condition> > - <fail unless="antatleast171" message="Please upgrade ant to at least 1.7.1"/> > + <property name="minimumantversion" value="1.9.0"/> > > + <antversion property="antversion" atleast="${minimumantversion}"/> > + <fail unless="antversion" message="Please upgrade ant to at least ${minimumantversion}. Current ant version is ${ant.version}"/> > + > <condition property="javaatleast17"> > <not> > <matches pattern="^1\.[0-6]($|\..*)" string="${ant.java.version}"/> > </not> > </condition> > - <fail unless="javaatleast17" message="Please upgrade java to at least 1.7"/> > + <fail unless="javaatleast17" message="Please upgrade java to at least 1.7. Current Java version is ${ant.java.version}"/> > > <dirname property="ofbiz.home.dir" file="${ant.file.Ant - Macros}"/> > <macrodef name="iterate"> > @@ -56,9 +56,6 @@ > <path id="rhino.class.path"> > <pathelement location="${ofbiz.home.dir}/extension/rhino/lib/js-1.7.R1.jar"/> > </path> > - <path id="ant.lib.class.path"> > - <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> > - </path> > <path id="junit.class.path"> > <fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting/" includes="*.jar"/> > <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/> > @@ -191,14 +188,11 @@ > </classpath> > </groovyc> > </presetdef> > - > <taskdef resource="net/sf/antcontrib/antlib.xml"> > <classpath> > <pathelement location="${ofbiz.home.dir}/framework/base/lib/ant/ant-contrib-1.0b3.jar"/> > </classpath> > </taskdef> > - <taskdef name="javacc" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> > - <taskdef name="jjtree" classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree" classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/> > <macrodef name="ofbiz-javacc"> > <attribute name="dir"/> > <attribute name="file"/> > @@ -226,39 +220,6 @@ > </sequential> > </macrodef> > > - <macrodef name="ofbiz-jjtree"> > - <attribute name="dir"/> > - <attribute name="file"/> > - <attribute name="prefix" default=""/> > - <sequential> > - <if> > - <not> > - <uptodate > - srcfile="@{prefix}src/@{dir}/@{file}.jjt" > - targetfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"/> > - </not> > - <delete dir="@{prefix}build/gen-src/jjtree/@{dir}"/> > - <mkdir dir="@{prefix}build/gen-src/jjtree/@{dir}"/> > - <jjtree target="@{prefix}src/@{dir}/@{file}.jjt" > - javacchome="${ofbiz.home.dir}/lib/build/javacc" > - outputdirectory="@{prefix}build/gen-src/jjtree/@{dir}"/> > - </if> > - <if> > - <not> > - <uptodate > - srcfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj" > - targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/> > - </not> > - <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/> > - <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/> > - <javacc target="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj" > - javacchome="${ofbiz.home.dir}/lib/build/javacc" > - outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/> > - <delete dir="@{prefix}build/classes/@{dir}"/> > - </if> > - </sequential> > - </macrodef> > - > <presetdef name="externalsubant"> > <subant inheritall="false"> > <propertyset> > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |