werken 2002/06/25 14:06:55
Modified: . jars.list project-ng.xml project.xml
src/java/org/apache/maven/app Maven.java
src/java/org/apache/maven/build RepositoryManager.java
src/templates/build/plugins/core plugin.jelly
src/templates/build/plugins/test plugin.jelly
Log:
maven-ng works again (mostly)
Revision Changes Path
1.28 +1 -1 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jars.list 24 Jun 2002 04:51:06 -0000 1.27
+++ jars.list 25 Jun 2002 21:06:55 -0000 1.28
@@ -34,7 +34,7 @@
commons-graph-0.8.jar
commons-grant-1.0-b1.jar
commons-io-0.2-dev.20020614.122300.jar
-commons-jelly-1.0-bob-1.jar
+commons-jelly-1.0-dev.20020625.084715.jar
commons-jexl-1.0-dev.jar
commons-lang-1.0-dev.jar
commons-logging-1.0.jar
1.5 +1 -1 jakarta-turbine-maven/project-ng.xml
Index: project-ng.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project-ng.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project-ng.xml 24 Jun 2002 04:51:06 -0000 1.4
+++ project-ng.xml 25 Jun 2002 21:06:55 -0000 1.5
@@ -319,7 +319,7 @@
<dependency>
<id>commons-jelly</id>
- <version>1.0-bob-1</version>
+ <version>1.0-dev.20020625.084715</version>
<url>http://jakarta.apache.org/commons/sandbox/jelly/</url>
</dependency>
1.124 +1 -1 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- project.xml 24 Jun 2002 16:40:19 -0000 1.123
+++ project.xml 25 Jun 2002 21:06:55 -0000 1.124
@@ -330,7 +330,7 @@
<dependency>
<id>commons-jelly</id>
- <version>1.0-bob-1</version>
+ <version>1.0-dev.20020625.084715</version>
<url>http://jakarta.apache.org/commons/sandbox/jelly/</url>
</dependency>
1.18 +0 -1 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Maven.java 25 Jun 2002 16:56:39 -0000 1.17
+++ Maven.java 25 Jun 2002 21:06:55 -0000 1.18
@@ -947,7 +947,6 @@
}
}
- System.err.println( "eachGoal: " + eachGoal );
eachGoal.attain(session);
}
}
1.6 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/build/RepositoryManager.java
Index: RepositoryManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/build/RepositoryManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RepositoryManager.java 22 Jun 2002 15:42:46 -0000 1.5
+++ RepositoryManager.java 25 Jun 2002 21:06:55 -0000 1.6
@@ -113,7 +113,7 @@
for (int jarIndex = 0; jarIndex < jars.size(); jarIndex++)
{
jar = (String) jars.get(jarIndex);
- LOG.info("Checking jar: " + jar);
+ // LOG.info("Checking jar: " + jar);
if (!getLocalRepository().hasFile(jar))
{
//missingJars.add(jars);
1.3 +6 -0
jakarta-turbine-maven/src/templates/build/plugins/core/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 25 Jun 2002 16:50:14 -0000 1.2
+++ plugin.jelly 25 Jun 2002 21:06:55 -0000 1.3
@@ -6,6 +6,9 @@
<pathelement location="${pom.build.SourceDirectory}"/>
</path>
+ <patternset id="maven.jar.resources.set">
+ </patternset>
+
<path id="maven.dependency.classpath">
<j:forEach var="dep" items="${pom.dependencies}">
<pathelement location="${maven.repo.local}/${dep.jar}"/>
@@ -73,7 +76,10 @@
<goal name="maven:jar"
description="Create the deliverable jar file."
+ prereqs="maven:jar-resources">
+<!--
prereqs="maven:test,maven:jar-resources">
+-->
<jar
jarfile="${maven.build.dir}/${maven.final.name}.jar"
basedir="${maven.build.dest}"
1.3 +9 -1
jakarta-turbine-maven/src/templates/build/plugins/test/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/test/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 25 Jun 2002 16:56:39 -0000 1.2
+++ plugin.jelly 25 Jun 2002 21:06:55 -0000 1.3
@@ -1,6 +1,12 @@
<project xmlns:j="jelly:core">
+ <patternset id="maven.unit.test.set">
+ <j:forEach var="pat" items="${pom.build.unitTestPatterns}">
+ <include name="${pat}"/>
+ </j:forEach>
+ </patternset>
+
<goal name="maven:test.prepare-filesystem">
<mkdir dir="${maven.test.dest}"/>
<mkdir dir="${maven.test.reportsDirectory}"/>
@@ -45,8 +51,10 @@
<pathelement location="${maven.test.dest}"/>
</classpath>
<batchtest todir="${maven.test.reportsDirectory}">
- <fileset dir="${maven.unitTestSourceDirectory}">
+ <fileset dir="${pom.build.unitTestSourceDirectory}">
+<!--
<patternset refid="maven.unit.test.set"/>
+-->
</fileset>
</batchtest>
</junit>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
