Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed plus-to-minus formatting for pom translation, and for bridged pom file creation. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164123 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
John Dennis Casey 2005-04-21 21:09:23 +00:00
parent 35cc18bfbd
commit ba80b40d9b
2 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/RepositoryCleaner.java
View File

@ -368,7 +368,7 @@ private void rewriteArtifactsAndPoms( List artifacts, ArtifactRepository sourceR
transaction.addFile( targetPom );
File bridgedTargetPom = new File( targetRepositoryBase, bridgingLayout.pathOfMetadata( pom ) );
File bridgedTargetPom = new File( targetRepositoryBase, bridgingLayout.pathOfMetadata( pom ).replace('+', '-') );
transaction.addFile( bridgedTargetPom );

61
sandbox/repoclean/src/main/java/org/apache/maven/tools/repoclean/translate/PomV3ToV4Translator.java
View File

@ -63,10 +63,10 @@ public Model translate( org.apache.maven.model.v3_0_0.Model v3Model, Reporter re
{
try
{
String groupId = v3Model.getGroupId();
String artifactId = v3Model.getArtifactId();
String groupId = format( v3Model.getGroupId() );
String artifactId = format( v3Model.getArtifactId() );
String id = v3Model.getId();
String id = format( v3Model.getId() );
if ( StringUtils.isNotEmpty( id ) )
{
if ( StringUtils.isEmpty( groupId ) )
@ -80,10 +80,10 @@ public Model translate( org.apache.maven.model.v3_0_0.Model v3Model, Reporter re
}
}
String version = v3Model.getCurrentVersion();
String version = format( v3Model.getCurrentVersion() );
if ( version == null )
{
version = v3Model.getVersion();
version = format( v3Model.getVersion() );
}
PomKey pomKey = new PomKey( groupId, artifactId, version );
@ -94,7 +94,7 @@ public Model translate( org.apache.maven.model.v3_0_0.Model v3Model, Reporter re
try
{
model = new Model();
model.setArtifactId( v3Model.getArtifactId() );
model.setArtifactId( artifactId );
// moved this above the translation of the build, to allow
// additional plugins to be defined in v3 poms via
@ -110,7 +110,7 @@ public Model translate( org.apache.maven.model.v3_0_0.Model v3Model, Reporter re
model.setDistributionManagement( translateDistributionManagement( pomKey, v3Model ) );
model.setGroupId( v3Model.getGroupId() );
model.setGroupId( groupId );
model.setInceptionYear( v3Model.getInceptionYear() );
model.setIssueManagement( translateIssueManagement( v3Model ) );
@ -139,6 +139,11 @@ public Model translate( org.apache.maven.model.v3_0_0.Model v3Model, Reporter re
}
}
private String format( String source )
{
return (source == null)?(null):(source.replace('+', '-'));
}
private CiManagement translateCiManagementInfo( org.apache.maven.model.v3_0_0.Build v3Build )
{
CiManagement ciMgmt = null;
@ -501,11 +506,27 @@ private List translateDependencies( List v3Deps )
{
org.apache.maven.model.v3_0_0.Dependency v3Dep = (org.apache.maven.model.v3_0_0.Dependency) it.next();
String groupId = format( v3Dep.getGroupId() );
String artifactId = format( v3Dep.getArtifactId() );
String id = format( v3Dep.getId() );
if( StringUtils.isNotEmpty( id ) )
{
if( StringUtils.isEmpty( groupId ) )
{
groupId = id;
}
if( StringUtils.isEmpty( artifactId ) )
{
artifactId = id;
}
}
String type = v3Dep.getType();
if( "plugin".equals( type ) )
{
String groupId = v3Dep.getGroupId();
if( "maven".equals( groupId ) )
{
groupId = "org.apache.maven.plugins";
@ -513,8 +534,8 @@ private List translateDependencies( List v3Deps )
Plugin plugin = new Plugin();
plugin.setGroupId( groupId );
plugin.setArtifactId( v3Dep.getArtifactId() );
plugin.setVersion( v3Dep.getVersion() );
plugin.setArtifactId( artifactId );
plugin.setVersion( format( v3Dep.getVersion() ) );
Xpp3Dom config = new Xpp3Dom( "configuration" );
@ -542,25 +563,13 @@ private List translateDependencies( List v3Deps )
{
Dependency dep = new Dependency();
String artifactId = v3Dep.getArtifactId();
String groupId = v3Dep.getGroupId();
if(StringUtils.isNotEmpty(artifactId) && StringUtils.isNotEmpty(groupId))
{
dep.setGroupId(groupId);
dep.setArtifactId(artifactId);
}
else
{
dep.setGroupId(v3Dep.getId());
dep.setArtifactId(v3Dep.getId());
}
dep.setGroupId(groupId);
dep.setArtifactId(artifactId);
dep.setVersion( v3Dep.getVersion() );
dep.setType( v3Dep.getType() );
String scope = v3Dep.getProperty( "scope" );
if( scope != null && scope.trim().length() > 0 )
if( StringUtils.isNotEmpty( scope ) )
{
dep.setScope( scope );
}