You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/08/01 05:39:47 UTC
svn commit: r226727 - in /maven/components/trunk/sandbox/repoclean: ./
src/assembly/ src/main/java/org/apache/maven/model/v3_0_0/
src/main/java/org/apache/maven/tools/repoclean/rewrite/
src/main/java/org/apache/maven/tools/repoclean/translate/ src/test...
Author: brett
Date: Sun Jul 31 20:39:36 2005
New Revision: 226727
URL: http://svn.apache.org/viewcvs?rev=226727&view=rev
Log:
PR: MRM-8
switch generated sources for the maven-model-3.0.0 JAR
Removed:
maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/model/v3_0_0/
Modified:
maven/components/trunk/sandbox/repoclean/pom.xml
maven/components/trunk/sandbox/repoclean/src/assembly/bin.xml
maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite/V3PomRewriter.java
maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
maven/components/trunk/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java
Modified: maven/components/trunk/sandbox/repoclean/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/pom.xml?rev=226727&r1=226726&r2=226727&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/pom.xml (original)
+++ maven/components/trunk/sandbox/repoclean/pom.xml Sun Jul 31 20:39:36 2005
@@ -11,37 +11,36 @@
<groupId>plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-3</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-mail-sender-api</artifactId>
<version>1.0-alpha-1</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-mail-sender-simple</artifactId>
<version>1.0-alpha-1</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
<version>1.1-alpha-1</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0-alpha-2</version>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>2.0-alpha-2</version>
- <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -50,6 +49,7 @@
<scope>test</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
@@ -62,6 +62,7 @@
<version>1.0-alpha-2</version>
<scope>provided</scope>
</dependency>
+-->
</dependencies>
<build>
<plugins>
Modified: maven/components/trunk/sandbox/repoclean/src/assembly/bin.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/assembly/bin.xml?rev=226727&r1=226726&r2=226727&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/assembly/bin.xml (original)
+++ maven/components/trunk/sandbox/repoclean/src/assembly/bin.xml Sun Jul 31 20:39:36 2005
@@ -6,6 +6,7 @@
<fileSets>
<fileSet>
<directory>src/main/bash</directory>
+ <outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
<!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
Modified: maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite/V3PomRewriter.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite/V3PomRewriter.java?rev=226727&r1=226726&r2=226727&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite/V3PomRewriter.java (original)
+++ maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/rewrite/V3PomRewriter.java Sun Jul 31 20:39:36 2005
@@ -3,9 +3,9 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.maven.model.v3_0_0.io.xpp3.MavenXpp3Reader;
import org.apache.maven.tools.repoclean.report.Reporter;
import org.apache.maven.tools.repoclean.translate.PomV3ToV4Translator;
+import org.apache.maven.project.io.xpp3.MavenXpp3Reader;
import org.codehaus.plexus.util.StringUtils;
import java.io.Reader;
@@ -45,7 +45,7 @@
{
MavenXpp3Reader v3Reader = new MavenXpp3Reader();
- org.apache.maven.model.v3_0_0.Model v3Model = v3Reader.read( from );
+ org.apache.maven.project.Model v3Model = v3Reader.read( from );
v4Model = translator.translate( v3Model, reporter );
}
else
Modified: maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java?rev=226727&r1=226726&r2=226727&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java (original)
+++ maven/components/trunk/sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java Sun Jul 31 20:39:36 2005
@@ -19,6 +19,7 @@
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.model.Site;
+import org.apache.maven.project.UnitTest;
import org.apache.maven.tools.repoclean.report.ReportWriteException;
import org.apache.maven.tools.repoclean.report.Reporter;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -58,7 +59,7 @@
private transient List discoveredPlugins = new ArrayList();
- public Model translate( org.apache.maven.model.v3_0_0.Model v3Model, Reporter reporter )
+ public Model translate( org.apache.maven.project.Model v3Model, Reporter reporter )
throws ReportWriteException
{
try
@@ -151,10 +152,10 @@
private String format( String source )
{
- return ( source == null ) ? ( null ) : ( source.replace( '+', '-' ) );
+ return source == null ? null : source.replace( '+', '-' );
}
- private CiManagement translateCiManagementInfo( org.apache.maven.model.v3_0_0.Build v3Build )
+ private CiManagement translateCiManagementInfo( org.apache.maven.project.Build v3Build )
{
CiManagement ciMgmt = null;
@@ -177,7 +178,7 @@
return ciMgmt;
}
- private void warnOfUnsupportedMainModelElements( org.apache.maven.model.v3_0_0.Model v3Model, Reporter reporter )
+ private void warnOfUnsupportedMainModelElements( org.apache.maven.project.Model v3Model, Reporter reporter )
throws ReportWriteException
{
if ( StringUtils.isNotEmpty( v3Model.getExtend() ) )
@@ -187,8 +188,8 @@
if ( StringUtils.isNotEmpty( v3Model.getGumpRepositoryId() ) )
{
- reporter.warn( "Ignoring gump repository id: \'" + v3Model.getGumpRepositoryId()
- + "\'. This is not supported in v4 POMs." );
+ reporter.warn( "Ignoring gump repository id: \'" + v3Model.getGumpRepositoryId() +
+ "\'. This is not supported in v4 POMs." );
}
if ( notEmpty( v3Model.getVersions() ) )
@@ -229,11 +230,11 @@
}
}
- private Scm translateScm( org.apache.maven.model.v3_0_0.Model v3Model )
+ private Scm translateScm( org.apache.maven.project.Model v3Model )
{
Scm scm = null;
- org.apache.maven.model.v3_0_0.Repository repo = v3Model.getRepository();
+ org.apache.maven.project.Repository repo = v3Model.getRepository();
if ( repo != null )
{
scm = new Scm();
@@ -259,11 +260,11 @@
Pattern pluginNamePattern = Pattern.compile( "maven-(.+)-plugin" );
Matcher matcher = pluginNamePattern.matcher( reportName );
- String reportPluginName = null;
+ String reportPluginName;
if ( !matcher.matches() )
{
- reporter.warn( "Non-standard report name: \'" + reportName
- + "\'. Using entire name for plugin artifactId." );
+ reporter.warn(
+ "Non-standard report name: \'" + reportName + "\'. Using entire name for plugin artifactId." );
reportPluginName = reportName;
}
@@ -303,9 +304,8 @@
return reports;
}
- private org.apache.maven.model.Organization translateOrganization(
- org.apache.maven.model.v3_0_0.Organization v3Organization,
- Reporter reporter )
+ private Organization translateOrganization( org.apache.maven.project.Organization v3Organization,
+ Reporter reporter )
throws ReportWriteException
{
Organization organization = null;
@@ -334,7 +334,7 @@
{
for ( Iterator it = v3MailingLists.iterator(); it.hasNext(); )
{
- org.apache.maven.model.v3_0_0.MailingList v3List = (org.apache.maven.model.v3_0_0.MailingList) it
+ org.apache.maven.project.MailingList v3List = (org.apache.maven.project.MailingList) it
.next();
MailingList list = new MailingList();
list.setArchive( v3List.getArchive() );
@@ -357,7 +357,7 @@
{
for ( Iterator it = v3Licenses.iterator(); it.hasNext(); )
{
- org.apache.maven.model.v3_0_0.License v3License = (org.apache.maven.model.v3_0_0.License) it.next();
+ org.apache.maven.project.License v3License = (org.apache.maven.project.License) it.next();
License license = new License();
license.setComments( v3License.getComments() );
license.setName( v3License.getName() );
@@ -370,7 +370,7 @@
return licenses;
}
- private IssueManagement translateIssueManagement( org.apache.maven.model.v3_0_0.Model v3Model )
+ private IssueManagement translateIssueManagement( org.apache.maven.project.Model v3Model )
{
IssueManagement issueMgmt = null;
@@ -385,7 +385,7 @@
}
private DistributionManagement translateDistributionManagement( PomKey pomKey,
- org.apache.maven.model.v3_0_0.Model v3Model )
+ org.apache.maven.project.Model v3Model )
throws PomTranslationException
{
DistributionManagement distributionManagement = new DistributionManagement();
@@ -484,7 +484,7 @@
{
for ( Iterator it = v3Developers.iterator(); it.hasNext(); )
{
- org.apache.maven.model.v3_0_0.Developer v3Developer = (org.apache.maven.model.v3_0_0.Developer) it
+ org.apache.maven.project.Developer v3Developer = (org.apache.maven.project.Developer) it
.next();
Developer developer = new Developer();
@@ -512,7 +512,7 @@
{
for ( Iterator it = v3Deps.iterator(); it.hasNext(); )
{
- org.apache.maven.model.v3_0_0.Dependency v3Dep = (org.apache.maven.model.v3_0_0.Dependency) it.next();
+ org.apache.maven.project.Dependency v3Dep = (org.apache.maven.project.Dependency) it.next();
String groupId = format( v3Dep.getGroupId() );
String artifactId = format( v3Dep.getArtifactId() );
@@ -607,7 +607,7 @@
{
for ( Iterator it = v3Contributors.iterator(); it.hasNext(); )
{
- org.apache.maven.model.v3_0_0.Contributor v3Contributor = (org.apache.maven.model.v3_0_0.Contributor) it
+ org.apache.maven.project.Contributor v3Contributor = (org.apache.maven.project.Contributor) it
.next();
Contributor contributor = new Contributor();
@@ -626,7 +626,7 @@
return contributors;
}
- private Build translateBuild( org.apache.maven.model.v3_0_0.Build v3Build, Reporter reporter )
+ private Build translateBuild( org.apache.maven.project.Build v3Build, Reporter reporter )
throws ReportWriteException
{
Build build = null;
@@ -641,7 +641,7 @@
build.setResources( translateResources( v3Build.getResources() ) );
- org.apache.maven.model.v3_0_0.UnitTest unitTest = v3Build.getUnitTest();
+ UnitTest unitTest = v3Build.getUnitTest();
if ( unitTest != null )
{
build.setTestResources( translateResources( unitTest.getResources() ) );
@@ -649,7 +649,6 @@
List testIncludes = unitTest.getIncludes();
List testExcludes = new ArrayList( unitTest.getExcludes() );
- testExcludes.addAll( unitTest.getDefaultExcludes() );
if ( notEmpty( testIncludes ) || notEmpty( testExcludes ) )
{
@@ -718,7 +717,7 @@
return build;
}
- private void warnOfUnsupportedBuildElements( org.apache.maven.model.v3_0_0.Build v3Build, Reporter reporter )
+ private void warnOfUnsupportedBuildElements( org.apache.maven.project.Build v3Build, Reporter reporter )
throws ReportWriteException
{
if ( notEmpty( v3Build.getSourceModifications() ) )
@@ -745,13 +744,12 @@
{
for ( Iterator it = v3Resources.iterator(); it.hasNext(); )
{
- org.apache.maven.model.v3_0_0.Resource v3Resource = (org.apache.maven.model.v3_0_0.Resource) it.next();
+ org.apache.maven.project.Resource v3Resource = (org.apache.maven.project.Resource) it.next();
Resource resource = new Resource();
resource.setDirectory( v3Resource.getDirectory() );
List excludes = new ArrayList( v3Resource.getExcludes() );
- excludes.removeAll( v3Resource.getDefaultExcludes() );
resource.setExcludes( excludes );
Modified: maven/components/trunk/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java?rev=226727&r1=226726&r2=226727&view=diff
==============================================================================
--- maven/components/trunk/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java (original)
+++ maven/components/trunk/sandbox/repoclean/src/test/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4TranslatorTest.java Sun Jul 31 20:39:36 2005
@@ -35,13 +35,13 @@
Reporter reporter = new DummyReporter();
- org.apache.maven.model.v3_0_0.Dependency v3Dep = new org.apache.maven.model.v3_0_0.Dependency();
+ org.apache.maven.project.Dependency v3Dep = new org.apache.maven.project.Dependency();
v3Dep.setGroupId( "testGroup" );
v3Dep.setArtifactId( "testArtifact" );
v3Dep.setVersion( "1.0" );
v3Dep.addProperty( "scope", "test" );
- org.apache.maven.model.v3_0_0.Model v3Model = new org.apache.maven.model.v3_0_0.Model();
+ org.apache.maven.project.Model v3Model = new org.apache.maven.project.Model();
v3Model.addDependency( v3Dep );
Model result = translator.translate( v3Model, reporter );
@@ -56,13 +56,13 @@
Reporter reporter = new DummyReporter();
- org.apache.maven.model.v3_0_0.Dependency v3Dep = new org.apache.maven.model.v3_0_0.Dependency();
+ org.apache.maven.project.Dependency v3Dep = new org.apache.maven.project.Dependency();
v3Dep.setGroupId( "testGroup" );
v3Dep.setArtifactId( "testArtifact" );
v3Dep.setVersion( "1.0" );
v3Dep.setType( "plugin" );
- org.apache.maven.model.v3_0_0.Model v3Model = new org.apache.maven.model.v3_0_0.Model();
+ org.apache.maven.project.Model v3Model = new org.apache.maven.project.Model();
v3Model.addDependency( v3Dep );
Model result = translator.translate( v3Model, reporter );
@@ -83,13 +83,13 @@
Reporter reporter = new DummyReporter();
- org.apache.maven.model.v3_0_0.Dependency v3Dep = new org.apache.maven.model.v3_0_0.Dependency();
+ org.apache.maven.project.Dependency v3Dep = new org.apache.maven.project.Dependency();
v3Dep.setGroupId( "maven" );
v3Dep.setArtifactId( "testArtifact" );
v3Dep.setVersion( "1.0" );
v3Dep.setType( "plugin" );
- org.apache.maven.model.v3_0_0.Model v3Model = new org.apache.maven.model.v3_0_0.Model();
+ org.apache.maven.project.Model v3Model = new org.apache.maven.project.Model();
v3Model.addDependency( v3Dep );
Model result = translator.translate( v3Model, reporter );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org