brett 2004/09/21 06:47:53
Modified: changelog project.xml
changelog/src/main/org/apache/maven/cvslib
CvsChangeLogGenerator.java
changelog/src/test/org/apache/maven/cvslib
CvsChangeLogGeneratorTest.java
changelog/src/test/org/apache/maven/perforcelib
PerforceChangeLogGeneratorTest.java
changelog/xdocs changes.xml
dist project.xml
dist/xdocs changes.xml
linkcheck project.xml
linkcheck/xdocs changes.xml
multiproject project.xml
multiproject/xdocs changes.xml
xdoc project.xml
xdoc/src/main/org/apache/maven DescribedDependency.java
xdoc/xdocs changes.xml
Log:
use maven-model-1.1-SNAPSHOT
This should remain backwards compatible with 1.0.x, with the exception of ChangeLog
- there is a TODO to resolve this.
Revision Changes Path
1.52 +9 -5 maven-plugins/changelog/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/project.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- project.xml 15 Jul 2004 00:27:45 -0000 1.51
+++ project.xml 21 Sep 2004 13:47:52 -0000 1.52
@@ -23,9 +23,8 @@
<pomVersion>3</pomVersion>
<id>maven-changelog-plugin</id>
<name>Maven Changelog Plugin</name>
- <currentVersion>1.7.2-SNAPSHOT</currentVersion>
- <description/>
- <shortDescription>Produce SCM changelog reports</shortDescription>
+ <currentVersion>1.8-SNAPSHOT</currentVersion>
+ <shortDescription>Produce SCM changelog reports. Requires Maven
1.1.</shortDescription>
<url>http://maven.apache.org/reference/plugins/changelog/</url>
<issueTrackingUrl>http://jira.codehaus.org/browse/MPCHANGELOG</issueTrackingUrl>
<siteDirectory>/www/maven.apache.org/reference/plugins/changelog/</siteDirectory>
@@ -125,7 +124,7 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
- <version>20040613.030723</version>
+ <version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
</dependency>
<dependency>
@@ -153,7 +152,12 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<!-- Required to build under for JDK 1.3 because we fork junit -->
1.11 +3 -2
maven-plugins/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
Index: CvsChangeLogGenerator.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CvsChangeLogGenerator.java 2 Mar 2004 15:00:18 -0000 1.10
+++ CvsChangeLogGenerator.java 21 Sep 2004 13:47:52 -0000 1.11
@@ -29,7 +29,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.maven.changelog.AbstractChangeLogGenerator;
import org.apache.maven.changelog.ChangeLogParser;
-import org.apache.maven.project.Repository;
+// TODO: use maven-scm for this, remove dep on Maven 1.1
+import org.apache.maven.project.RepositoryUtils;
import org.apache.maven.util.AsyncStreamReader;
import org.apache.tools.ant.types.Commandline;
@@ -122,7 +123,7 @@
*/
protected Commandline getScmLogCommand()
{
- String tokens[] = Repository.splitSCMConnection(getConnection());
+ String tokens[] = RepositoryUtils.splitSCMConnection(getConnection());
if (!tokens[POS_SCM_TYPE].equals("cvs"))
{
1.10 +5 -4
maven-plugins/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
Index: CvsChangeLogGeneratorTest.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CvsChangeLogGeneratorTest.java 2 Mar 2004 15:00:19 -0000 1.9
+++ CvsChangeLogGeneratorTest.java 21 Sep 2004 13:47:52 -0000 1.10
@@ -18,7 +18,8 @@
*/
-import org.apache.maven.project.Repository;
+// TODO: use maven-scm
+import org.apache.maven.project.RepositoryUtils;
import org.apache.maven.util.EnhancedStringTokenizer;
import org.apache.tools.ant.types.Commandline;
@@ -107,7 +108,7 @@
public void testParse(Test test) throws Throwable
{
- String[] expected = Repository.tokenizerToArray(new
EnhancedStringTokenizer(test.args, "|"));
+ String[] expected = RepositoryUtils.tokenizerToArray(new
EnhancedStringTokenizer(test.args, "|"));
ExposeGenerator eg = new ExposeGenerator();
try
1.3 +3 -2
maven-plugins/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java
Index: PerforceChangeLogGeneratorTest.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PerforceChangeLogGeneratorTest.java 2 Mar 2004 15:00:19 -0000 1.2
+++ PerforceChangeLogGeneratorTest.java 21 Sep 2004 13:47:52 -0000 1.3
@@ -17,7 +17,8 @@
* ====================================================================
*/
-import org.apache.maven.project.Repository;
+// TODO: use maven-scm
+import org.apache.maven.project.RepositoryUtils;
import org.apache.maven.util.EnhancedStringTokenizer;
import org.apache.tools.ant.types.Commandline;
@@ -74,7 +75,7 @@
public void testParse(Test test) throws Throwable
{
- String[] expected = Repository.tokenizerToArray(new
EnhancedStringTokenizer(test.args, "|"));
+ String[] expected = RepositoryUtils.tokenizerToArray(new
EnhancedStringTokenizer(test.args, "|"));
PerforceChangeLogGenerator eg = new PerforceChangeLogGenerator();
try {
1.42 +2 -1 maven-plugins/changelog/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/xdocs/changes.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- changes.xml 26 Jul 2004 02:39:28 -0000 1.41
+++ changes.xml 21 Sep 2004 13:47:52 -0000 1.42
@@ -25,7 +25,8 @@
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.7.2-SNAPSHOT" date="in CVS">
+ <release version="1.8-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="update">Upgrade to Maven 1.1 libraries.</action>
</release>
<release version="1.7.1" date="2004-07-12">
<action dev="dion" type="fix" issue="MPCHANGELOG-36" due-to="Matt
Read">changelog.xml author tag in Clearcase contains developer.id.</action>
1.38 +6 -0 maven-plugins/dist/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dist/project.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- project.xml 3 Jul 2004 18:02:09 -0000 1.37
+++ project.xml 21 Sep 2004 13:47:52 -0000 1.38
@@ -87,5 +87,11 @@
<artifactId>maven</artifactId>
<version>1.0</version>
</dependency>
+ <!-- Test dep -->
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
1.22 +1 -0 maven-plugins/dist/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/dist/xdocs/changes.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- changes.xml 27 Aug 2004 11:15:05 -0000 1.21
+++ changes.xml 21 Sep 2004 13:47:52 -0000 1.22
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.7-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="update">Make compatible with Maven 1.1</action>
<action dev="carlos" type="add" issue="MPDIST-13">Added
<code>maven.dist.bin.artifact</code> property.</action>
<action dev="carlos" type="update">Don't generate ant build file, call
maven-ant-plugin before or set a preGoal</action>
<action dev="carlos" type="update">Add NOTICE file to distribution</action>
1.56 +8 -3 maven-plugins/linkcheck/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/linkcheck/project.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- project.xml 2 Sep 2004 01:29:37 -0000 1.55
+++ project.xml 21 Sep 2004 13:47:52 -0000 1.56
@@ -106,13 +106,13 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
- <version>20030211.142705</version>
+ <version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-ant</artifactId>
- <version>20040902.000000</version>
+ <version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/ant/</url>
</dependency>
<dependency>
@@ -123,7 +123,12 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven-jelly-tags</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<!-- Required for commons-httpclient -->
1.26 +1 -0 maven-plugins/linkcheck/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/linkcheck/xdocs/changes.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- changes.xml 18 Aug 2004 20:15:32 -0000 1.25
+++ changes.xml 21 Sep 2004 13:47:52 -0000 1.26
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.4-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="update">Make compatible with Maven 1.1</action>
<action dev="carlos" type="fix">Some performance improvements</action>
<action dev="carlos" type="fix" issue="MPLINKCHECK-15" due-to="Stephane
Mikaty">Use BufferedInputStream in FileToCheck</action>
<action dev="carlos" type="fix">Set links as invalid on unknown
errors</action>
1.33 +6 -0 maven-plugins/multiproject/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/project.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- project.xml 15 Jul 2004 00:22:54 -0000 1.32
+++ project.xml 21 Sep 2004 13:47:53 -0000 1.33
@@ -110,5 +110,11 @@
<type>jar</type>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <type>jar</type>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
1.30 +1 -0 maven-plugins/multiproject/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/xdocs/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- changes.xml 6 Aug 2004 21:09:51 -0000 1.29
+++ changes.xml 21 Sep 2004 13:47:53 -0000 1.30
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.4-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="update">Make compatible with Maven 1.1</action>
<action dev="dion" type="fix" issue="MPMULTIPROJECT-41">Document multiproject
dependency convergence report</action>
<action dev="dion" type="add" issue="MPMULTIPROJECT-33">Add
multiproject:site-deploy</action>
<action dev="brett" type="update">Deprecate dependency handle</action>
1.61 +8 -3 maven-plugins/xdoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/project.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- project.xml 13 Jul 2004 12:18:59 -0000 1.60
+++ project.xml 21 Sep 2004 13:47:53 -0000 1.61
@@ -144,7 +144,7 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly</artifactId>
- <version>20030902.160215</version>
+ <version>1.0-beta-4</version>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
@@ -164,7 +164,7 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
- <version>20040613.030723</version>
+ <version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
</dependency>
<dependency>
@@ -175,7 +175,12 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
- <version>1.0-rc2</version>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>velocity</groupId>
1.5 +1 -13
maven-plugins/xdoc/src/main/org/apache/maven/DescribedDependency.java
Index: DescribedDependency.java
===================================================================
RCS file:
/home/cvs/maven-plugins/xdoc/src/main/org/apache/maven/DescribedDependency.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DescribedDependency.java 6 Jun 2004 02:57:26 -0000 1.4
+++ DescribedDependency.java 21 Sep 2004 13:47:53 -0000 1.5
@@ -159,18 +159,6 @@
}
/**
- * Dependency's name property getter.
- *
- * @return dependency's name.
- *
- * @see Dependency#getName()
- */
- public String getName()
- {
- return dependency.getName();
- }
-
- /**
* Dependency's type property getter.
*
* @return dependency's type.
1.65 +1 -0 maven-plugins/xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/xdoc/xdocs/changes.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- changes.xml 16 Sep 2004 23:18:59 -0000 1.64
+++ changes.xml 21 Sep 2004 13:47:53 -0000 1.65
@@ -27,6 +27,7 @@
</properties>
<body>
<release version="1.9-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="update">Make compatible with Maven 1.1</action>
<action dev="aheritier" type="fix" issue="MPXDOC-117" due-to="Dennis
Lundberg">Show version if maven.xdoc.date=right</action>
<action dev="aheritier" type="fix" issue="MPXDOC-115" due-to="Brent
Worden">Allow header images and links to use relative paths</action>
<action dev="carlos" type="add" issue="MPFAQ-11">Added dt css style</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
