You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by br...@apache.org on 2005/03/16 02:43:09 UTC
cvs commit: maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository ArtifactRepository.java
brett 2005/03/15 17:43:09
Modified: maven-core/src/main/java/org/apache/maven/cli MavenCli.java
maven-core/src/main/java/org/apache/maven DefaultMaven.java
maven-artifact/src/main/java/org/apache/maven/artifact/repository
ArtifactRepository.java
Log:
cleanup
Revision Changes Path
1.20 +2 -1 maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Index: MavenCli.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MavenCli.java 15 Mar 2005 21:41:05 -0000 1.19
+++ MavenCli.java 16 Mar 2005 01:43:09 -0000 1.20
@@ -143,6 +143,7 @@
if ( commandLine.hasOption( CLIManager.REACTOR ) )
{
+ // TODO: should we now include the pom.xml in the current directory?
String includes = System.getProperty( "maven.reactor.includes", "**/" + POMv4 );
String excludes = System.getProperty( "maven.reactor.excludes", POMv4 );
1.32 +6 -18 maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Index: DefaultMaven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- DefaultMaven.java 15 Mar 2005 23:36:28 -0000 1.31
+++ DefaultMaven.java 16 Mar 2005 01:43:09 -0000 1.32
@@ -50,7 +50,6 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -134,8 +133,12 @@
List goals;
if ( "pom".equals( project.getPackaging() ) )
{
+ goals = new ArrayList();
+
// TODO: not required if discovered and cached
- goals = Collections.singletonList( "pom:install" );
+ goals.add( "pom:install" );
+
+ goals.addAll( request.getGoals() );
}
else
{
@@ -423,19 +426,4 @@
return secs + " seconds";
}
}
-
- // ----------------------------------------------------------------------
- //
- // ----------------------------------------------------------------------
-
- // ----------------------------------------------------------------------
- // Reactor
- // ----------------------------------------------------------------------
-
- public List getSortedProjects( List projects )
- throws CycleDetectedException
- {
- return projectBuilder.getSortedProjects( projects );
- }
-
}
\ No newline at end of file
1.5 +1 -19 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
Index: ArtifactRepository.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ArtifactRepository.java 15 Mar 2005 21:41:06 -0000 1.4
+++ ArtifactRepository.java 16 Mar 2005 01:43:09 -0000 1.5
@@ -39,22 +39,4 @@
{
super( id, url, authInfo );
}
-
- /*
- * private String layout; public String getLayout() { if ( layout == null ) {
- * return "${groupId}/${type}s/${artifactId}-${version}.${extension}"; }
- * return layout; } public String artifactPath( Artifact artifact ) { return
- * interpolateLayout( artifact.getGroupId(), artifact.getArtifactId(),
- * artifact.getVersion(), artifact.getType(), artifact.getExtension() ); }
- * public String fullArtifactPath( Artifact artifact ) { return getBasedir() +
- * "/" + artifactPath( artifact ); } public String artifactUrl( Artifact
- * artifact ) { return getUrl() + "/" + artifactPath( artifact ); } private
- * String interpolateLayout( String groupId, String artifactId, String
- * version, String type, String extension ) { String layout = getLayout();
- * layout = StringUtils.replace( layout, "${groupId}", groupId ); layout =
- * StringUtils.replace( layout, "${artifactId}", artifactId ); layout =
- * StringUtils.replace( layout, "${type}", type ); layout =
- * StringUtils.replace( layout, "${version}", version ); layout =
- * StringUtils.replace( layout, "${extension}", extension ); return layout; }
- */
}
\ No newline at end of file