You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by Niclas Hedhman <ni...@hedhman.org> on 2004/12/21 14:59:29 UTC
Re: cvs commit: gump/project directory-eve.xml directory-janus.xml directory-kerberos.xml directory-ldap.xml directory-naming.xml directory-snickers.xml
I have noticed my mistake.... Correcting!!
Niclas
On Tuesday 21 December 2004 21:47, niclas@apache.org wrote:
> niclas 2004/12/21 05:47:58
>
> Modified: project directory-eve.xml directory-janus.xml
> directory-kerberos.xml directory-ldap.xml
> directory-naming.xml directory-snickers.xml
> Log:
> APplied the new-won knowledge of when the property attribute in depend
> elements are relevant
>
> Revision Changes Path
> 1.4 +9 -9 gump/project/directory-eve.xml
>
> Index: directory-eve.xml
> ===================================================================
> RCS file: /home/cvs/gump/project/directory-eve.xml,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- directory-eve.xml 20 Dec 2004 09:04:38 -0000 1.3
> +++ directory-eve.xml 21 Dec 2004 13:47:57 -0000 1.4
> @@ -52,10 +52,10 @@
> <project name="eve-protocol">
> <maven goal="jar" basedir="protocol">
> <property name="maven.final.name" value="eve-protocol-@@DATE@@"/>
> + <depend project="jakarta-oro" property="maven.jar.oro" />
> + <depend project="jakarta-regexp" property="maven.jar.regexp" />
> </maven>
>
> - <depend project="jakarta-oro" property="maven.jar.oro" />
> - <depend project="jakarta-regexp" property="maven.jar.regexp" />
> <depend project="antlr" />
> <depend project="snickers-codec" />
> <depend project="ldap-common" />
> @@ -77,6 +77,7 @@
> <project name="maven-eve-plugin">
> <maven goal="jar" basedir="plugin">
> <property name="maven.final.name"
> value="maven-eve-plugin-@@DATE@@"/> + <depend
> property="maven.jar.velocity-dep" project="jakarta-velocity" id="velocity"
> /> </maven>
>
> <depend project="junit" />
> @@ -84,7 +85,6 @@
> <depend project="antlr" />
> <depend project="ldap-common" />
> <depend project="eve-shared" />
> - <depend property="maven.jar.velocity-dep" project="jakarta-velocity"
> id="velocity" />
>
> <home nested="plugin" />
>
> @@ -101,16 +101,16 @@
> <project name="eve-core">
> <maven goal="jar" basedir="core">
> <property name="maven.final.name" value="eve-core-@@DATE@@"/>
> + <depend project="jakarta-regexp" property="maven.jar.regexp" />
> + <depend project="jakarta-oro" property="maven.jar.oro" />
> + <depend property="aspectjrt.jar" project="aspectj"
> id="aspectjrt"/> </maven>
>
> - <depend project="jakarta-regexp" property="maven.jar.regexp" />
> - <depend project="jakarta-oro" property="maven.jar.oro" />
> <depend project="commons-logging" />
> <depend project="commons-io" />
> <depend project="antlr" />
> <depend project="jdbm" />
> <depend project="ldap-common" />
> - <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
> <depend project="eve-shared" />
> <depend project="eve-protocol" />
> <depend project="snickers-codec" />
> @@ -135,10 +135,11 @@
> <project name="eve">
> <maven goal="jar" basedir="main">
> <property name="maven.final.name" value="eve-@@DATE@@"/>
> + <depend project="jakarta-regexp" property="maven.jar.regexp" />
> + <depend project="jakarta-oro" property="maven.jar.oro" />
> + <depend property="aspectjrt.jar" project="aspectj"
> id="aspectjrt"/> </maven>
>
> - <depend project="jakarta-regexp" property="maven.jar.regexp" />
> - <depend project="jakarta-oro" property="maven.jar.oro" />
> <depend project="commons-lang" />
> <depend project="commons-logging" />
> <depend project="commons-collections" />
> @@ -146,7 +147,6 @@
> <depend project="antlr" />
> <depend project="jdbm" />
> <depend project="ldap-common" />
> - <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
> <depend project="eve-shared" />
> <depend project="eve-protocol" />
> <depend project="snickers-codec" />
>
>
>
> 1.5 +1 -1 gump/project/directory-janus.xml
>
> Index: directory-janus.xml
> ===================================================================
> RCS file: /home/cvs/gump/project/directory-janus.xml,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- directory-janus.xml 21 Dec 2004 12:37:25 -0000 1.4
> +++ directory-janus.xml 21 Dec 2004 13:47:57 -0000 1.5
> @@ -138,12 +138,12 @@
> <project name="janus-script">
> <maven goal="jar" basedir="script">
> <property name="maven.final.name" value="janus-script-@@DATE@@"/>
> + <depend property="maven.jar.xercesImpl" project="xml-xerces" />
> </maven>
>
> <depend project="janus-api" />
> <depend project="janus-impl" />
> <depend project="dom4j" />
> - <depend property="maven.jar.xercesImpl" project="xml-xerces" />
> <depend project="xml-apis" />
> <depend project="jmock" />
>
>
>
>
> 1.5 +3 -3 gump/project/directory-kerberos.xml
>
> Index: directory-kerberos.xml
> ===================================================================
> RCS file: /home/cvs/gump/project/directory-kerberos.xml,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- directory-kerberos.xml 21 Dec 2004 10:25:55 -0000 1.4
> +++ directory-kerberos.xml 21 Dec 2004 13:47:57 -0000 1.5
> @@ -52,15 +52,15 @@
> <project name="eve-kerberos">
> <maven goal="jar" basedir="eve-kerberos">
> <property name="maven.final.name" value="eve-kerberos-@@DATE@@"/>
> + <depend property="maven.jar.regexp" project="jakarta-regexp"
> id="regexp" /> + <depend property="maven.jar.oro"
> project="jakarta-oro" id="oro" /> + <depend property="aspectjrt.jar"
> project="aspectj" id="aspectjrt"/> </maven>
>
> - <depend property="maven.jar.regexp" project="jakarta-regexp"
> id="regexp" /> - <depend property="maven.jar.oro" project="jakarta-oro"
> id="oro" /> <depend project="commons-io" />
> <depend project="antlr" />
> <depend project="jdbm" />
> <depend project="ldap-common" />
> - <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
> <depend project="kerberos" />
> <depend project="eve-core" />
> <depend project="eve-shared" />
>
>
>
> 1.2 +5 -5 gump/project/directory-ldap.xml
>
> Index: directory-ldap.xml
> ===================================================================
> RCS file: /home/cvs/gump/project/directory-ldap.xml,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- directory-ldap.xml 17 Dec 2004 15:56:08 -0000 1.1
> +++ directory-ldap.xml 21 Dec 2004 13:47:57 -0000 1.2
> @@ -26,11 +26,11 @@
> <project name="ldap-clients">
> <maven basedir="clients" goal="jar" >
> <property name="maven.final.name"
> value="ldap-clients-@@DATE@@"/> + <depend
> property="maven.jar.regexp" project="jakarta-regexp" /> </maven>
> <package>org.apache.ldap.clients</package>
>
> <depend project="commons-collections"/>
> - <depend property="maven.jar.regexp" project="jakarta-regexp" />
> <depend project="avalon-framework-api"/>
> <depend project="avalon-framework-impl"/>
> <!-- Does not exist (anymore?)! depend
> project="excalibur-cli"/ --> @@ -54,14 +54,14 @@
> <project name="ldap-common">
> <maven basedir="common" goal="jar" >
> <property name="maven.final.name"
> value="ldap-common-@@DATE@@"/> + <depend
> property="maven.jar.xmlParserAPIs" project="xml-apis" /> + <depend
> property="maven.jar.regexp" project="jakarta-regexp" /> + <depend
> property="maven.jar.oro" project="jakarta-oro" /> </maven>
> <package>org.apache.ldap.common</package>
>
> - <depend property="maven.jar.regexp" project="jakarta-regexp" />
> - <depend property="maven.jar.oro" project="jakarta-oro" />
> <depend project="antlr"/>
> <depend project="snickers-codec"/>
> - <depend property="maven.jar.xmlParserAPIs" project="xml-apis" />
> <depend project="junit"/>
> <depend project="xml-xerces"/>
>
> @@ -104,6 +104,7 @@
> <project name="ldap-snickers-provider">
> <maven basedir="snickers-provider" goal="jar" >
> <property name="maven.final.name"
> value="ldap-snickers-provider-@@DATE@@"/> + <depend
> property="maven.jar.regexp" project="jakarta-regexp" /> </maven>
> <package>org.apache.ldap.ldap.common.berlib.snickers</package>
>
> @@ -116,7 +117,6 @@
> <depend project="junit"/>
> <depend project="ldap-common"/>
> <depend project="ldap-snacc-provider"/>
> - <depend property="maven.jar.regexp" project="jakarta-regexp" />
> <depend project="snickers-ber"/>
> <depend project="snacc"/>
> <depend project="xml-xerces"/>
>
>
>
> 1.23 +0 -1 gump/project/directory-naming.xml
>
> Index: directory-naming.xml
> ===================================================================
> RCS file: /home/cvs/gump/project/directory-naming.xml,v
> retrieving revision 1.22
> retrieving revision 1.23
> diff -u -r1.22 -r1.23
> --- directory-naming.xml 21 Dec 2004 13:20:24 -0000 1.22
> +++ directory-naming.xml 21 Dec 2004 13:47:57 -0000 1.23
> @@ -56,7 +56,6 @@
> <property name="maven.final.name"
> value="directory-naming-factory-@@DATE@@"/> <property
> name="maven.jar.geronimo-spec-jta" project="jta" id="jta"
> reference="jarpath"/> <property name="maven.jar.geronimo-spec-javamail"
> project="javamail" id="javamail" reference="jarpath"/> - <property
> name="maven.jar.mx4j-jmx" project="mx4j" id="mx4j-jmx"
> reference="jarpath"/> </maven>
>
> <depend project="directory-naming-core" />
>
>
>
> 1.3 +1 -1 gump/project/directory-snickers.xml
>
> Index: directory-snickers.xml
> ===================================================================
> RCS file: /home/cvs/gump/project/directory-snickers.xml,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- directory-snickers.xml 21 Dec 2004 12:39:03 -0000 1.2
> +++ directory-snickers.xml 21 Dec 2004 13:47:57 -0000 1.3
> @@ -32,6 +32,7 @@
> <project name="snickers-ber">
> <maven basedir="ber" goal="jar" >
> <property name="maven.final.name"
> value="snickers-ber-@@DATE@@"/> + <depend
> property="maven.jar.regexp" project="jakarta-regexp" /> </maven>
> <package>org.apache.snickers.ber</package>
>
> @@ -46,7 +47,6 @@
> <depend project="ldap-common"/>
> <depend project="ldap-snacc-provider"/>
> <depend project="snacc"/>
> - <depend property="maven.jar.regexp" project="jakarta-regexp" />
> <depend project="junit"/>
> <depend project="xml-xerces"/>
--
+------//-------------------+
/ http://www.dpml.net /
/ http://niclas.hedhman.org /
+------//-------------------+
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org