Author: niclas Date: Sat Dec 11 01:10:19 2004 New Revision: 111591 URL: http://svn.apache.org/viewcvs?view=rev&rev=111591 Log: Trying to fix some of the depend problems. Modified: incubator/directory/eve/trunk/gump.xml incubator/directory/janus/trunk/gump.xml incubator/directory/kerberos/trunk/gump.xml incubator/directory/ldap/trunk/gump.xml incubator/directory/naming/trunk/gump.xml incubator/directory/snickers/trunk/gump.xml
Modified: incubator/directory/eve/trunk/gump.xml Url: http://svn.apache.org/viewcvs/incubator/directory/eve/trunk/gump.xml?view=diff&rev=111591&p1=incubator/directory/eve/trunk/gump.xml&r1=111590&p2=incubator/directory/eve/trunk/gump.xml&r2=111591 ============================================================================== --- incubator/directory/eve/trunk/gump.xml (original) +++ incubator/directory/eve/trunk/gump.xml Sat Dec 11 01:10:19 2004 @@ -38,8 +38,8 @@ <property name="maven.final.name" value="eve-protocol-@@DATE@@"/> </maven> - <depend project="oro" /> - <depend project="regexp" /> + <depend property="maven.regexp.jar" project="jakarta-regexp"> + <depend property="maven.oro.jar" project="jakarta-oro"> <depend project="antlr" /> <depend project="snickers-codec" /> <depend project="ldap-common" /> @@ -68,7 +68,7 @@ <depend project="antlr" /> <depend project="ldap-common" /> <depend project="eve-shared" /> - <depend project="velocity-dep" /> + <depend property="maven.velocity-dep.jar" project="velocity" /> <home nested="plugin" /> @@ -87,8 +87,8 @@ <property name="maven.final.name" value="eve-dib-@@DATE@@"/> </maven> - <depend project="regexp" /> - <depend project="oro" /> + <depend property="maven.regexp.jar" project="jakarta-regexp"> + <depend property="maven.oro.jar" project="jakarta-oro"> <depend project="commons-logging" /> <depend project="commons-io" /> <depend project="antlr" /> @@ -121,8 +121,8 @@ <property name="maven.final.name" value="eve-@@DATE@@"/> </maven> - <depend project="regexp" /> - <depend project="oro" /> + <depend property="maven.regexp.jar" project="jakarta-regexp"> + <depend property="maven.oro.jar" project="jakarta-oro"> <depend project="commons-lang" /> <depend project="commons-logging" /> <depend project="commons-collections" /> Modified: incubator/directory/janus/trunk/gump.xml Url: http://svn.apache.org/viewcvs/incubator/directory/janus/trunk/gump.xml?view=diff&rev=111591&p1=incubator/directory/janus/trunk/gump.xml&r1=111590&p2=incubator/directory/janus/trunk/gump.xml&r2=111591 ============================================================================== --- incubator/directory/janus/trunk/gump.xml (original) +++ incubator/directory/janus/trunk/gump.xml Sat Dec 11 01:10:19 2004 @@ -71,6 +71,98 @@ <junitreport nested="jdbc/target/test-reports" /> +<<<<<<< .mine + <project name="janus-api"> + <maven basedir="core/api" goal="jar" > + <property name="maven.final.name" value="janus-api-@@DATE@@"/> + </maven> + <package>org.apache.janus</package> + + <depend project="jmock"/> + <depend project="junit"/> + <depend project="xml-xerces"/> + + <home nested="core/api"/> + <mkdir dir="core/api/target/classes"/> + <work nested="core/api/target/classes"/> + <mkdir dir="core/api/target/test-classes"/> + <work nested="core/api/target/test-classes"/> + <jar name="target/janus-api-@@DATE@@.jar"/> + + <nag to="[EMAIL PROTECTED]" + from="directory-naming development <[EMAIL PROTECTED]>"/> + </project> + + <project name="janus-impl"> + <maven basedir="core/impl" goal="jar" > + <property name="maven.final.name" value="janus-impl-@@DATE@@"/> + </maven> + <package>org.apache.janus</package> + + <depend project="commons-collections"/> + <depend project="janus-api"/> + <depend project="jmock"/> + <depend project="junit"/> + <depend project="xml-xerces"/> + + <home nested="core/impl"/> + <mkdir dir="core/impl/target/classes"/> + <work nested="core/impl/target/classes"/> + <mkdir dir="core/impl/target/test-classes"/> + <work nested="core/impl/target/test-classes"/> + <jar name="target/janus-impl-@@DATE@@.jar"/> + + <nag to="[EMAIL PROTECTED]" + from="directory-naming development <[EMAIL PROTECTED]>"/> + </project> + + <project name="janus-jdbc"> + <maven basedir="jdbc" goal="jar" > + <property name="maven.final.name" value="janus-jdbc-@@DATE@@"/> + </maven> + <package>org.apache.janus</package> + + <depend project="hsqldb"/> + <depend project="janus-api"/> + <depend project="janus-impl"/> + <depend project="jmock"/> + <depend project="junit"/> + <depend project="xml-xerces"/> + + <home nested="jdbc"/> + <mkdir dir="jdbc/target/classes"/> + <work nested="jdbc/target/classes"/> + <mkdir dir="jdbc/target/test-classes"/> + <work nested="jdbc/target/test-classes"/> + <jar name="target/janus-jdbc-@@DATE@@.jar"/> + + <nag to="[EMAIL PROTECTED]" + from="directory-naming development <[EMAIL PROTECTED]>"/> + </project> + + <project name="janus-script"> + <maven basedir="script" goal="jar" > + <property name="maven.final.name" value="janus-script-@@DATE@@"/> + </maven> + <package>org.apache.janus</package> + + <depend project="snickers-codec"/> + <depend project="commons-logging"/> + <depend project="commons-net"/> + <depend project="junit"/> + <depend project="xml-xerces"/> + + <home nested="script"/> + <mkdir dir="script/target/classes"/> + <work nested="script/target/classes"/> + <mkdir dir="script/target/test-classes"/> + <work nested="script/target/test-classes"/> + <jar name="target/janus-script-@@DATE@@.jar"/> + + <nag to="[EMAIL PROTECTED]" + from="directory-naming development <[EMAIL PROTECTED]>"/> + </project> +======= <nag from="janus-jdbc development <[EMAIL PROTECTED]>" to="[EMAIL PROTECTED]"/> </project> @@ -143,4 +235,5 @@ <nag from="janus-script development <[EMAIL PROTECTED]>" to="[EMAIL PROTECTED]"/> </project> +>>>>>>> .r111533 </module> Modified: incubator/directory/kerberos/trunk/gump.xml Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/gump.xml?view=diff&rev=111591&p1=incubator/directory/kerberos/trunk/gump.xml&r1=111590&p2=incubator/directory/kerberos/trunk/gump.xml&r2=111591 ============================================================================== --- incubator/directory/kerberos/trunk/gump.xml (original) +++ incubator/directory/kerberos/trunk/gump.xml Sat Dec 11 01:10:19 2004 @@ -38,15 +38,15 @@ <property name="maven.final.name" value="eve-kerberos-@@DATE@@"/> </maven> - <depend project="regexp" /> - <depend project="oro" /> + <depend property="maven.regexp.jar" project="jakarta-regexp"> + <depend property="maven.oro.jar" project="jakarta-oro"> <depend project="commons-io" /> <depend project="antlr" /> <depend project="jdbm" /> <depend project="ldap-common" /> <depend project="aspectjrt" /> <depend project="kerberos" /> - <depend project="eve-jndi-provider" /> + <depend project="eve-dib" /> <depend project="eve-shared" /> <depend project="maven-eve-plugin" /> <depend project="junit" /> Modified: incubator/directory/ldap/trunk/gump.xml Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/gump.xml?view=diff&rev=111591&p1=incubator/directory/ldap/trunk/gump.xml&r1=111590&p2=incubator/directory/ldap/trunk/gump.xml&r2=111591 ============================================================================== --- incubator/directory/ldap/trunk/gump.xml (original) +++ incubator/directory/ldap/trunk/gump.xml Sat Dec 11 01:10:19 2004 @@ -57,11 +57,11 @@ </maven> <package>org.apache.ldap.common</package> - <depend project="regexp"/> - <depend project="oro"/> + <depend property="maven.regexp.jar" project="jakarta-regexp"> + <depend property="maven.oro.jar" project="jakarta-oro"> <depend project="antlr"/> <depend project="snickers-codec"/> - <depend project="xmlParserAPIs"/> + <depend property="maven.xmlParserAPIs.jar" project="xml-apis"> <depend project="junit"/> <depend project="xml-xerces"/> Modified: incubator/directory/naming/trunk/gump.xml Url: http://svn.apache.org/viewcvs/incubator/directory/naming/trunk/gump.xml?view=diff&rev=111591&p1=incubator/directory/naming/trunk/gump.xml&r1=111590&p2=incubator/directory/naming/trunk/gump.xml&r2=111591 ============================================================================== --- incubator/directory/naming/trunk/gump.xml (original) +++ incubator/directory/naming/trunk/gump.xml Sat Dec 11 01:10:19 2004 @@ -20,7 +20,7 @@ <depend project="commons-collections" /> <depend project="junit" /> - <depend project="mx4j-jmx" /> + <depend property="maven.mx4j-jmx.jar" project="mx4j" id="mx4j-jmx" /> <home nested="core" /> @@ -40,7 +40,7 @@ </maven> <depend project="directory-naming-core" /> - <depend project="jta-spec" /> + <depend property="maven.jta-spec.jar" project="jta" id="jta"> <depend project="javamail" /> <depend project="commons-logging" /> <depend project="commons-lang" /> @@ -51,7 +51,7 @@ <depend project="hsqldb" /> <depend project="commons-collections" /> <depend project="junit" /> - <depend project="mx4j-jmx" /> + <depend property="maven.mx4j-jmx.jar" project="mx4j" id="mx4j-jmx" /> <home nested="factory" /> Modified: incubator/directory/snickers/trunk/gump.xml Url: http://svn.apache.org/viewcvs/incubator/directory/snickers/trunk/gump.xml?view=diff&rev=111591&p1=incubator/directory/snickers/trunk/gump.xml&r1=111590&p2=incubator/directory/snickers/trunk/gump.xml&r2=111591 ============================================================================== --- incubator/directory/snickers/trunk/gump.xml (original) +++ incubator/directory/snickers/trunk/gump.xml Sat Dec 11 01:10:19 2004 @@ -45,7 +45,7 @@ <depend project="ldap-common"/> <depend project="ldap-snacc-provider"/> <depend project="snacc"/> - <depend project="regexp"/> + <depend property="maven.regexp.jar" project="jakarta-regexp"> <depend project="junit"/> <depend project="xml-xerces"/> @@ -60,8 +60,8 @@ from="directory-naming development <[EMAIL PROTECTED]>"/> </project> - <project name="codec"> - <maven basedir="snickers-codec" goal="jar" > + <project name="snickers-codec"> + <maven basedir="codec" goal="jar" > <property name="maven.final.name" value="snickers-codec-@@DATE@@"/> </maven> <package>org.apache.commons.codec</package>
