diff --git a/changelog/project.xml b/changelog/project.xml index e82e9a47..a5ac8a32 100644 --- a/changelog/project.xml +++ b/changelog/project.xml @@ -23,9 +23,8 @@ 3 maven-changelog-plugin Maven Changelog Plugin - 1.7.2-SNAPSHOT - - Produce SCM changelog reports + 1.8-SNAPSHOT + Produce SCM changelog reports. Requires Maven 1.1. http://maven.apache.org/reference/plugins/changelog/ http://jira.codehaus.org/browse/MPCHANGELOG /www/maven.apache.org/reference/plugins/changelog/ @@ -125,7 +124,7 @@ commons-jelly commons-jelly-tags-xml - 20040613.030723 + 1.0 http://jakarta.apache.org/commons/jelly/libs/xml/ @@ -153,7 +152,12 @@ maven maven - 1.0 + 1.1-SNAPSHOT + + + maven + maven-model + 1.1-SNAPSHOT diff --git a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java index 25aa33e1..4dc626a4 100644 --- a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java +++ b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java @@ -29,7 +29,8 @@ import org.apache.commons.logging.Log; 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 @@ class CvsChangeLogGenerator extends AbstractChangeLogGenerator */ protected Commandline getScmLogCommand() { - String tokens[] = Repository.splitSCMConnection(getConnection()); + String tokens[] = RepositoryUtils.splitSCMConnection(getConnection()); if (!tokens[POS_SCM_TYPE].equals("cvs")) { diff --git a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java index 9eede77e..3063fb58 100644 --- a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java +++ b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java @@ -18,7 +18,8 @@ package org.apache.maven.cvslib; */ -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; @@ -26,7 +27,7 @@ import junit.framework.TestCase; /** * @author Ben Walding - * @version $Id: CvsChangeLogGeneratorTest.java,v 1.9 2004/03/02 15:00:19 evenisse Exp $ + * @version $Id: CvsChangeLogGeneratorTest.java,v 1.10 2004/09/21 13:47:52 brett Exp $ */ class ExposeGenerator extends CvsChangeLogGenerator { @@ -39,7 +40,7 @@ class ExposeGenerator extends CvsChangeLogGenerator /** * @author Ben Walding - * @version $Id: CvsChangeLogGeneratorTest.java,v 1.9 2004/03/02 15:00:19 evenisse Exp $ + * @version $Id: CvsChangeLogGeneratorTest.java,v 1.10 2004/09/21 13:47:52 brett Exp $ */ public class CvsChangeLogGeneratorTest extends TestCase { @@ -107,7 +108,7 @@ public class CvsChangeLogGeneratorTest extends TestCase 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 diff --git a/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java b/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java index dbcbe7a4..b44447ca 100644 --- a/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java +++ b/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java @@ -17,7 +17,8 @@ package org.apache.maven.perforcelib; * ==================================================================== */ -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 class PerforceChangeLogGeneratorTest extends TestCase 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 { diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml index b3499f1a..3434ccf3 100644 --- a/changelog/xdocs/changes.xml +++ b/changelog/xdocs/changes.xml @@ -25,7 +25,8 @@ Emmanuel Venisse - + + Upgrade to Maven 1.1 libraries. changelog.xml author tag in Clearcase contains developer.id. diff --git a/dist/project.xml b/dist/project.xml index a3ba88dc..f2d3b90a 100644 --- a/dist/project.xml +++ b/dist/project.xml @@ -87,5 +87,11 @@ maven 1.0 + + + maven + maven-model + 1.1-SNAPSHOT + diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml index b0c5415a..0a15ac0b 100644 --- a/dist/xdocs/changes.xml +++ b/dist/xdocs/changes.xml @@ -25,6 +25,7 @@ + Make compatible with Maven 1.1 Added maven.dist.bin.artifact property. Don't generate ant build file, call maven-ant-plugin before or set a preGoal Add NOTICE file to distribution diff --git a/linkcheck/project.xml b/linkcheck/project.xml index 774bd15a..2c84c4cc 100644 --- a/linkcheck/project.xml +++ b/linkcheck/project.xml @@ -106,13 +106,13 @@ commons-jelly commons-jelly-tags-xml - 20030211.142705 + 1.0 http://jakarta.apache.org/commons/jelly/libs/xml/ commons-jelly commons-jelly-tags-ant - 20040902.000000 + 1.0 http://jakarta.apache.org/commons/jelly/libs/ant/ @@ -123,7 +123,12 @@ maven maven-jelly-tags - 1.0 + 1.1-SNAPSHOT + + + maven + maven-model + 1.1-SNAPSHOT diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml index f334fc0c..e89c904d 100644 --- a/linkcheck/xdocs/changes.xml +++ b/linkcheck/xdocs/changes.xml @@ -26,6 +26,7 @@ + Make compatible with Maven 1.1 Some performance improvements Use BufferedInputStream in FileToCheck Set links as invalid on unknown errors diff --git a/multiproject/project.xml b/multiproject/project.xml index 90c9dfa2..3a94af11 100644 --- a/multiproject/project.xml +++ b/multiproject/project.xml @@ -110,5 +110,11 @@ jar 1.0 + + maven + maven-model + jar + 1.1-SNAPSHOT + diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml index 769c0117..4e5825cf 100644 --- a/multiproject/xdocs/changes.xml +++ b/multiproject/xdocs/changes.xml @@ -26,6 +26,7 @@ + Make compatible with Maven 1.1 Document multiproject dependency convergence report Add multiproject:site-deploy Deprecate dependency handle diff --git a/xdoc/project.xml b/xdoc/project.xml index b4bc6a91..4f95e802 100644 --- a/xdoc/project.xml +++ b/xdoc/project.xml @@ -144,7 +144,7 @@ commons-jelly commons-jelly - 20030902.160215 + 1.0-beta-4 commons-jelly @@ -164,7 +164,7 @@ commons-jelly commons-jelly-tags-xml - 20040613.030723 + 1.0 http://jakarta.apache.org/commons/jelly/libs/xml/ @@ -175,7 +175,12 @@ maven maven - 1.0-rc2 + 1.0 + + + maven + maven-model + 1.1-SNAPSHOT velocity diff --git a/xdoc/src/main/org/apache/maven/DescribedDependency.java b/xdoc/src/main/org/apache/maven/DescribedDependency.java index f683213a..61a5ef89 100644 --- a/xdoc/src/main/org/apache/maven/DescribedDependency.java +++ b/xdoc/src/main/org/apache/maven/DescribedDependency.java @@ -23,7 +23,7 @@ import org.apache.maven.project.Dependency; * Dependency wrapper. Adds an url to download and a description. * * @author Michal Maczka - * @version $Id: DescribedDependency.java,v 1.4 2004/06/06 02:57:26 brett Exp $ + * @version $Id: DescribedDependency.java,v 1.5 2004/09/21 13:47:53 brett Exp $ */ public class DescribedDependency implements Comparable { @@ -158,18 +158,6 @@ public class DescribedDependency implements Comparable return dependency.getJar(); } - /** - * Dependency's name property getter. - * - * @return dependency's name. - * - * @see Dependency#getName() - */ - public String getName() - { - return dependency.getName(); - } - /** * Dependency's type property getter. * diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index ba1a046b..5726df54 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -27,6 +27,7 @@ + Make compatible with Maven 1.1 Show version if maven.xdoc.date=right Allow header images and links to use relative paths Added dt css style