On Wed, 2002-06-05 at 20:41, [EMAIL PROTECTED] wrote:
> glennm 2002/06/05 17:41:42
>
> Modified: . project.properties project.xml
> src/templates/build/plugins/core build-init.xml
> init.properties
> src/test/org/apache/maven/project ProjectMapperTest.java
> Log:
> Glenn McAllister - 2002/06/05
>
> - First pass at cleaning up the many lists of jars used to create maven. We
> *really* need to have a single list of jars.
There was only one list a while back. I'm not sure what happened with
the reworking.
> We also run into problems since
> the jars.list is being kept up to date, but the dependencies in project.xml
> aren't.
That was my fault last round.
> Now we add ${maven.home}/plugins/core/init.properties into the mix.
> I completely removed the list of jars from project.properties, as it wasn't
> needed at all.
>
> Revision Changes Path
> 1.18 +0 -13 jakarta-turbine-maven/project.properties
>
> Index: project.properties
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-maven/project.properties,v
> retrieving revision 1.17
> retrieving revision 1.18
> diff -u -r1.17 -r1.18
> --- project.properties 4 Jun 2002 01:12:03 -0000 1.17
> +++ project.properties 6 Jun 2002 00:41:41 -0000 1.18
> @@ -17,16 +17,3 @@
> maven.announcement = beta2
>
> maven.checkstyle.excludes = org/apache/maven/java/parser/**
> -
> -# jars needed in lib.repo by maven to execute
> -# This is a DUPLICATE of the entry in
>${maven.home}/plugins/core/default.properties
> -# as that file is not guaranteed to be available during bootstrapping.
> -# TODO: It may be possible to change the bootstrap process to use the
> -# src/templates/build/plugins/core/defaults.properties
> -maven.jars.list=antlr-2.7.1.jar,bcel-5.0.jar,checkstyle-2.2.jar,\
> -commons-beanutils-dev.jar,commons-betwixt-1.0-dev.jar,\
> -commons-collections-2.0.jar,commons-digester-1.2.jar,commons-graph-0.8.jar,\
> -commons-io-0.1.jar,commons-lang-0.1-dev.jar,commons-logging-1.0.jar,\
> -commons-util-1.0-rc2-dev.jar,dom4j-1.3.jar,jdepend-2.2.jar,log4j-1.1.3.jar,\
> -oro-2.0.6.jar,regexp-1.2.jar,velocity-1.3-dev.jar,velocity-dvsl-0.43.jar,\
> -maven.jar,commons-jelly-1.0-dev.jar
>
>
>
> 1.101 +2 -2 jakarta-turbine-maven/project.xml
>
> Index: project.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
> retrieving revision 1.100
> retrieving revision 1.101
> diff -u -r1.100 -r1.101
> --- project.xml 5 Jun 2002 06:07:20 -0000 1.100
> +++ project.xml 6 Jun 2002 00:41:41 -0000 1.101
> @@ -288,7 +288,7 @@
>
> <dependency>
> <id>dom4j</id>
> - <version>1.3</version>
> + <version>1.4-dev</version>
> <url>http://www.dom4j.org/</url>
> </dependency>
>
> @@ -329,7 +329,7 @@
>
> <dependency>
> <id>velocity</id>
> - <version>1.3-dev</version>
> + <version>1.4-dev</version>
> <url>http://jakarta.apache.org/velocity/</url>
> </dependency>
>
>
>
>
> 1.4 +2 -2
>jakarta-turbine-maven/src/templates/build/plugins/core/build-init.xml
>
> Index: build-init.xml
> ===================================================================
> RCS file:
>/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/build-init.xml,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- build-init.xml 5 Jun 2002 00:50:24 -0000 1.3
> +++ build-init.xml 6 Jun 2002 00:41:42 -0000 1.4
> @@ -6,7 +6,7 @@
> Based on src/templates/build/build-init-target v1.37
>
> author: dion
> - version: $Id: build-init.xml,v 1.3 2002/06/05 00:50:24 dion Exp $
> + version: $Id: build-init.xml,v 1.4 2002/06/06 00:41:42 glennm Exp $
> -->
>
> <project name="maven-init" default="verify-project">
> @@ -49,7 +49,7 @@
> <path id="maven-classpath">
> <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
> </path>
> -
> +
> <!-- define maven taskdefs, as taskdefs are not yet inheritable? -->
> <taskdef resource="maven-taskdefs.properties">
> <classpath refid="maven-classpath" />
>
>
>
> 1.2 +22 -7
>jakarta-turbine-maven/src/templates/build/plugins/core/init.properties
>
> Index: init.properties
> ===================================================================
> RCS file:
>/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/init.properties,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- init.properties 5 Jun 2002 00:50:24 -0000 1.1
> +++ init.properties 6 Jun 2002 00:41:42 -0000 1.2
> @@ -2,10 +2,25 @@
> # this property is a replacement for jars.list. See the info in
> # src/templates/build/plugins/core/build-init.xml about what needs to be
> # done to remove jars.list from maven
> -maven.jars.list=antlr-2.7.1.jar,bcel-5.0.jar,checkstyle-2.2.jar,\
> -commons-beanutils-dev.jar,commons-betwixt-1.0-dev.jar,\
> -commons-collections-2.0.jar,commons-digester-1.2.jar,commons-graph-0.8.jar,\
> -commons-io-0.1.jar,commons-lang-0.1-dev.jar,commons-logging-1.0.jar,\
> -commons-util-1.0-rc2-dev.jar,dom4j-1.3.jar,jdepend-2.2.jar,log4j-1.1.3.jar,\
> -oro-2.0.6.jar,regexp-1.2.jar,velocity-1.3-dev.jar,velocity-dvsl-0.43.jar,\
> -maven.jar,commons-jelly-1.0-dev.jar
> +maven.jars.list=antlr-2.7.1.jar,\
> +bcel-5.0.jar,\
> +checkstyle-2.2.jar,\
> +commons-beanutils-1.4-dev.jar,\
> +commons-betwixt-1.0-dev.jar,\
> +commons-collections-2.0.jar,\
> +commons-digester-1.2.jar,\
> +commons-graph-0.8.jar,\
> +commons-io-0.1.jar,\
> +commons-lang-0.1-dev.jar,\
> +commons-logging-1.0.jar,\
> +commons-util-1.0-rc2-dev.jar,\
> +dom4j-1.4-dev.jar,\
> +jdepend-2.2.jar,\
> +log4j-1.1.3.jar,\
> +oro-2.0.6.jar,\
> +regexp-1.2.jar,\
> +velocity-1.4-dev.jar,\
> +velocity-dvsl-0.43.jar,\
> +maven.jar,\
> +commons-jelly-1.0-dev.jar,\
> +commons-jexl-1.0-dev.jar
>
>
>
> 1.24 +2 -2
>jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java
>
> Index: ProjectMapperTest.java
> ===================================================================
> RCS file:
>/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java,v
> retrieving revision 1.23
> retrieving revision 1.24
> diff -u -r1.23 -r1.24
> --- ProjectMapperTest.java 3 Jun 2002 21:07:16 -0000 1.23
> +++ ProjectMapperTest.java 6 Jun 2002 00:41:42 -0000 1.24
> @@ -133,11 +133,11 @@
> // Test Dependencies
> assertEquals("dom4j",
> ((Dependency)p.getDependencies().get(0)).getId());
> - assertEquals("1.3",
> + assertEquals("1.4-dev",
> ((Dependency)p.getDependencies().get(0)).getVersion());
>
> // This is synthesized
> - assertEquals("dom4j-1.3.jar",
> + assertEquals("dom4j-1.4-dev.jar",
> ((Dependency)p.getDependencies().get(0)).getJar());
> assertEquals("http://www.dom4j.org/";,
> ((Dependency)p.getDependencies().get(0)).getUrl());
>
>
>
>
> --
> To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
--
jvz.
Jason van Zyl
[EMAIL PROTECTED]
http://tambora.zenplex.org
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
