Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use maven-model-1.1-SNAPSHOT

Browse Source 
This should remain backwards compatible with 1.0.x, with the exception of ChangeLog - there is a TODO to resolve this.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116054 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett 2004-09-21 13:47:53 +00:00
parent 757d4654f1
commit 82dbe2daa8
14 changed files with 55 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
changelog/project.xml
View File

@ -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 -->

5
changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
View File

@ -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"))
{

9
changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
View File

@ -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 <a href="bwalding@jakarta.org">Ben Walding</a>
* @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 <a href="bwalding@jakarta.org">Ben Walding</a>
* @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

5
changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java
View File

@ -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 {

3
changelog/xdocs/changes.xml
View File

@ -25,7 +25,8 @@
<author email="evenisse@ifrance.com">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>

6
dist/project.xml vendored
View File

@ -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
dist/xdocs/changes.xml vendored
View File

@ -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>

11
linkcheck/project.xml
View File

@ -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
linkcheck/xdocs/changes.xml
View File

@ -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>

6
multiproject/project.xml
View File

@ -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
multiproject/xdocs/changes.xml
View File

@ -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>

11
xdoc/project.xml
View File

@ -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>

14
xdoc/src/main/org/apache/maven/DescribedDependency.java
View File

@ -23,7 +23,7 @@ import org.apache.maven.project.Dependency;
* Dependency wrapper. Adds an url to download and a description.
*
* @author <a href="mailto:michal.maczka@dimatics.com">Michal Maczka</a>
* @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.
*

1
xdoc/xdocs/changes.xml
View File

@ -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>