svn commit: r1030971 - /maven/indexer/trunk/pom.xml
Author: dbradicich Date: Thu Nov 4 13:38:45 2010 New Revision: 1030971 URL: http://svn.apache.org/viewvc?rev=1030971view=rev Log: set proper scm urls Modified: maven/indexer/trunk/pom.xml Modified: maven/indexer/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/indexer/trunk/pom.xml?rev=1030971r1=1030970r2=1030971view=diff == --- maven/indexer/trunk/pom.xml (original) +++ maven/indexer/trunk/pom.xml Thu Nov 4 13:38:45 2010 @@ -78,9 +78,9 @@ under the License. /developers scm - connectionscm:svn:http://svn.sonatype.org/nexus/tags/nexus-indexer-artifact-1.0.1/connection - developerConnectionscm:svn:https://svn.sonatype.org/nexus/tags/nexus-indexer-artifact-1.0.1/developerConnection -urlhttp://svn.sonatype.org/nexus/tags/nexus-indexer-artifact-1.0.1/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/indexer/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/indexer/trunk/developerConnection +urlhttp://svn.apache.org/repos/asf/maven/indexer/trunk/url /scm properties
svn commit: r1031022 - in /maven/indexer/trunk: ./ indexer-artifact/ indexer-core/
Author: dbradicich Date: Thu Nov 4 15:12:49 2010 New Revision: 1031022 URL: http://svn.apache.org/viewvc?rev=1031022view=rev Log: updated svn ignore Modified: maven/indexer/trunk/ (props changed) maven/indexer/trunk/indexer-artifact/ (props changed) maven/indexer/trunk/indexer-core/ (props changed) Propchange: maven/indexer/trunk/ -- --- svn:ignore (added) +++ svn:ignore Thu Nov 4 15:12:49 2010 @@ -0,0 +1,3 @@ +.project +.settings +target Propchange: maven/indexer/trunk/indexer-artifact/ -- --- svn:ignore (added) +++ svn:ignore Thu Nov 4 15:12:49 2010 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target Propchange: maven/indexer/trunk/indexer-core/ -- --- svn:ignore (added) +++ svn:ignore Thu Nov 4 15:12:49 2010 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target
svn commit: r1031144 - in /maven/shared/trunk/maven-dependency-analyzer/src: main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java test/java/org/apache/maven/shared/dependen
Author: brianf
Date: Thu Nov 4 18:48:19 2010
New Revision: 1031144
URL: http://svn.apache.org/viewvc?rev=1031144view=rev
Log:
MDEP-149
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java?rev=1031144r1=1031143r2=1031144view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
Thu Nov 4 18:48:19 2010
@@ -229,7 +229,12 @@ public class DependencyVisitor
public void visitFieldInsn( final int opcode, final String owner, final
String name, final String desc )
{
addName( owner );
-addDesc( desc );
+/*
+ * NOTE: Merely accessing a field does not impose a direct dependency
on its type. For example, the code line
+ * codejava.lang.Object var = bean.field;/code does not directly
depend on the type of the field. A direct
+ * dependency is only introduced when the code explicitly references
the field's type by means of a variable
+ * declaration or a type check/cast. Those cases are handled by other
visitor callbacks.
+ */
}
/*
@@ -238,7 +243,12 @@ public class DependencyVisitor
public void visitMethodInsn( final int opcode, final String owner, final
String name, final String desc )
{
addName( owner );
-addMethodDesc( desc );
+/*
+ * NOTE: Merely invoking a method does not impose a direct dependency
on its return type nor its parameter
+ * types. For example, the code line codebean.method(null);/code
only depends on the owner type of the
+ * method. A direct dependency is only introduced when the code
explicitly references the method's types by
+ * means of a variable declaration or a type check/cast. Those cases
are handled by other visitor callbacks.
+ */
}
/*
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java?rev=1031144r1=1031143r2=1031144view=diff
==
---
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
(original)
+++
maven/shared/trunk/maven-dependency-analyzer/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
Thu Nov 4 18:48:19 2010
@@ -446,7 +446,7 @@ public class DependencyVisitorTest exten
{
visitor.visitFieldInsn( Opcodes.GETFIELD, a/b/c, x, Lx/y/z; );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
// visitMethodInsn tests --
@@ -476,21 +476,21 @@ public class DependencyVisitorTest exten
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
(Lx/y/z;)V );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
public void testVisitMethodInsnWithObjectArguments()
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
(Lp/q/r;Lx/y/z;)V );
-assertClasses( a.b.c, p.q.r, x.y.z );
+assertClasses( a.b.c );
}
public void testVisitMethodInsnWithObjectArrayArgument()
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
([Lx/y/z;)V );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
public void testVisitMethodInsnWithPrimitiveReturnType()
@@ -511,14 +511,14 @@ public class DependencyVisitorTest exten
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
()Lx/y/z; );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
public void testVisitMethodInsnWithObjectArrayReturnType()
{
visitor.visitMethodInsn( Opcodes.INVOKEVIRTUAL, a/b/c, x,
()[Lx/y/z; );
-assertClasses( a.b.c, x.y.z );
+assertClasses( a.b.c );
}
// visitJumpInsn tests
svn commit: r1031147 - /maven/shared/trunk/pom.xml
Author: brianf Date: Thu Nov 4 18:49:49 2010 New Revision: 1031147 URL: http://svn.apache.org/viewvc?rev=1031147view=rev Log: use the latest parent Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=1031147r1=1031146r2=1031147view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Thu Nov 4 18:49:49 2010 @@ -25,7 +25,7 @@ under the License. parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version16/version +version17/version relativePath../pom/maven/pom.xml/relativePath /parent
svn commit: r1031212 - in /maven/plugins/trunk/maven-dependency-plugin/src: main/java/org/apache/maven/plugin/dependency/ main/java/org/apache/maven/plugin/dependency/fromConfiguration/ main/java/org/
Author: brianf
Date: Thu Nov 4 20:17:28 2010
New Revision: 1031212
URL: http://svn.apache.org/viewvc?rev=1031212view=rev
Log:
MDEP-215 - applied patch by Jo Odland. Adds useSubDirectoryPerArtifact
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestAnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestUnpackDependenciesMojo2.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java?rev=1031212r1=1031211r2=1031212view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
Thu Nov 4 20:17:28 2010
@@ -72,6 +72,16 @@ public abstract class AbstractFromDepend
/**
* Place each type of file in a separate subdirectory. (example
+ * /outputDirectory/runtime /outputDirectory/provided etc)
+ *
+ * @parameter expression=${mdep.useSubDirectoryPerScope}
default-value=false
+ * @optional
+ * @since 2.1-alpha-1
+ */
+protected boolean useSubDirectoryPerScope;
+
+/**
+ * Place each type of file in a separate subdirectory. (example
* /outputDirectory/jars /outputDirectory/wars etc)
*
* @since 2.0-alpha-1
@@ -136,6 +146,23 @@ public abstract class AbstractFromDepend
}
/**
+ * @return Returns the useSubDirectoryPerScope
+ */
+public boolean isUseSubDirectoryPerScope()
+{
+return this.useSubDirectoryPerScope;
+}
+
+/**
+ * @param theUseSubDirectoryPerScope
+ * The useSubDirectoryPerScope to set.
+ */
+public void setUseSubDirectoryPerScope( boolean theUseSubDirectoryPerScope
)
+{
+this.useSubDirectoryPerScope = theUseSubDirectoryPerScope;
+}
+
+/**
* @return Returns the useSubDirectoryPerType.
*/
public boolean isUseSubDirectoryPerType()
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java?rev=1031212r1=1031211r2=1031212view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
Thu Nov 4 20:17:28 2010
@@ -172,6 +172,7 @@ public class AnalyzeDepMgt
Artifact resolvedArtifact = (Artifact) mismatchIter.next();
Dependency depMgtDependency = (Dependency) mismatch.get(
resolvedArtifact );
logMismatch( resolvedArtifact, depMgtDependency );
+foundError = true;
}
if ( !foundError )
{
svn commit: r1031218 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
Author: brianf
Date: Thu Nov 4 20:24:36 2010
New Revision: 1031218
URL: http://svn.apache.org/viewvc?rev=1031218view=rev
Log:
MDEP-292 applied patch from Greg Vanore
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java?rev=1031218r1=1031217r2=1031218view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/PurgeLocalRepositoryMojo.java
Thu Nov 4 20:24:36 2010
@@ -306,11 +306,30 @@ public class PurgeLocalRepositoryMojo
{
for ( Iterator it = exclusionPatterns.iterator(); it.hasNext(); )
{
-String excludedKey = (String) it.next();
-
-verbose( Excluding: + excludedKey + from refresh
operation for project: + project.getId() );
-
-deps.remove( excludedKey );
+ String excludedKey = (String) it.next();
+
+ if (GROUP_ID_FUZZINESS.equals(resolutionFuzziness))
+ {
+ verbose( Excluding groupId: + excludedKey + from
refresh operation for project: + project.getId() );
+
+ for ( Iterator deps_it = deps.entrySet().iterator();
deps_it.hasNext(); )
+ {
+ Map.Entry dependency = (Map.Entry)
deps_it.next();
+
+ Artifact artifact = (Artifact)
dependency.getValue();
+
+ if (artifact.getGroupId().equals(excludedKey))
+ {
+ deps_it.remove();
+ }
+ }
+ }
+ else
+ {
+ verbose( Excluding: + excludedKey + from refresh
operation for project: + project.getId() );
+
+ deps.remove( excludedKey );
+ }
}
}
svn commit: r1031220 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
Author: bentmann
Date: Thu Nov 4 20:28:34 2010
New Revision: 1031220
URL: http://svn.apache.org/viewvc?rev=1031220view=rev
Log:
[MDEP-215] copy-dependencies -- useSubDirectoryPerScope [patch]
o Fixed since tag
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java?rev=1031220r1=1031219r2=1031220view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractFromDependenciesMojo.java
Thu Nov 4 20:28:34 2010
@@ -76,7 +76,7 @@ public abstract class AbstractFromDepend
*
* @parameter expression=${mdep.useSubDirectoryPerScope}
default-value=false
* @optional
- * @since 2.1-alpha-1
+ * @since 2.2
*/
protected boolean useSubDirectoryPerScope;
svn commit: r1031245 - in /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency: ./ resolvers/ utils/
Author: brianf
Date: Thu Nov 4 21:04:45 2010
New Revision: 1031245
URL: http://svn.apache.org/viewvc?rev=1031245view=rev
Log:
MDEP-281 applied patch from Selim Ok
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java?rev=1031245r1=1031244r2=1031245view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractResolveMojo.java
Thu Nov 4 21:04:45 2010
@@ -69,6 +69,15 @@ public abstract class AbstractResolveMoj
* @throws ArtifactNotFoundException
* @throws InvalidDependencyVersionException
*/
+
+ /**
+* Whether to append outputs into the output file or overwrite it.
+*
+* @parameter expression=${appendOutput} default-value=false
+* @since 2.2
+*/
+ protected boolean appendOutput;
+
protected Set resolveDependencyArtifacts( MavenProject theProject )
throws ArtifactResolutionException, ArtifactNotFoundException,
InvalidDependencyVersionException
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java?rev=1031245r1=1031244r2=1031245view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/TreeMojo.java
Thu Nov 4 21:04:45 2010
@@ -224,7 +224,15 @@ public class TreeMojo extends AbstractMo
* The computed dependency tree root node of the Maven project.
*/
private DependencyNode rootNode;
-
+
+ /**
+* Whether to append outputs into the output file or overwrite it.
+*
+* @parameter expression=${appendOutput} default-value=false
+* @since 2.2
+*/
+ private boolean appendOutput;
+
// Mojo methods ---
/*
@@ -270,7 +278,7 @@ public class TreeMojo extends AbstractMo
if ( outputFile != null )
{
-DependencyUtil.write( dependencyTreeString, outputFile,
getLog() );
+DependencyUtil.write( dependencyTreeString, outputFile,
this.appendOutput ,getLog() );
getLog().info( Wrote dependency tree to: + outputFile );
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?rev=1031245r1=1031244r2=1031245view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
Thu Nov 4 21:04:45 2010
@@ -76,7 +76,7 @@ public class ResolveDependenciesMojo
}
else
{
-DependencyUtil.write( output, outputFile, getLog() );
+DependencyUtil.write( output, outputFile, appendOutput,
getLog() );
}
}
catch ( IOException e )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
URL:
svn commit: r1031251 - /maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
Author: brianf
Date: Thu Nov 4 21:15:44 2010
New Revision: 1031251
URL: http://svn.apache.org/viewvc?rev=1031251view=rev
Log:
MDEP-192 patch from Nikola Petrov
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java?rev=1031251r1=1031250r2=1031251view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyStatusSets.java
Thu Nov 4 21:15:44 2010
@@ -24,9 +24,8 @@ package org.apache.maven.plugin.dependen
*/
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
import org.apache.maven.artifact.Artifact;
@@ -37,11 +36,11 @@ import org.apache.maven.artifact.Artifac
public class DependencyStatusSets
{
-TreeSet resolvedDependencies = null;
+Set resolvedDependencies = null;
-TreeSet unResolvedDependencies = null;
+Set unResolvedDependencies = null;
-TreeSet skippedDependencies = null;
+Set skippedDependencies = null;
public DependencyStatusSets()
{
@@ -52,15 +51,15 @@ public class DependencyStatusSets
{
if ( resolved != null )
{
-this.resolvedDependencies = new TreeSet( resolved );
+this.resolvedDependencies = new LinkedHashSet( resolved );
}
if ( unResolved != null )
{
-this.unResolvedDependencies = new TreeSet( unResolved );
+this.unResolvedDependencies = new LinkedHashSet( unResolved );
}
if ( skipped != null )
{
-this.skippedDependencies = new TreeSet( skipped );
+this.skippedDependencies = new LinkedHashSet( skipped );
}
}
@@ -80,7 +79,7 @@ public class DependencyStatusSets
{
if ( resolvedDependencies != null )
{
-this.resolvedDependencies = new TreeSet( resolvedDependencies );
+this.resolvedDependencies = new LinkedHashSet(
resolvedDependencies );
}
else
{
@@ -104,7 +103,7 @@ public class DependencyStatusSets
{
if ( skippedDependencies != null )
{
-this.skippedDependencies = new TreeSet( skippedDependencies );
+this.skippedDependencies = new LinkedHashSet( skippedDependencies
);
}
else
{
@@ -128,7 +127,7 @@ public class DependencyStatusSets
{
if ( unResolvedDependencies != null )
{
-this.unResolvedDependencies = new TreeSet( unResolvedDependencies
);
+this.unResolvedDependencies = new LinkedHashSet(
unResolvedDependencies );
}
else
{
@@ -180,9 +179,9 @@ public class DependencyStatusSets
{
sb.append( \n );
sb.append( The following files were skipped:\n );
-SortedSet sortedSkippedDependencies = new TreeSet();
-sortedSkippedDependencies.addAll( this.skippedDependencies );
-for ( Iterator i = sortedSkippedDependencies.iterator();
i.hasNext(); )
+Set skippedDependencies = new LinkedHashSet();
+skippedDependencies.addAll( this.skippedDependencies );
+for ( Iterator i = skippedDependencies.iterator(); i.hasNext(); )
{
sb.append( + ( (Artifact) i.next() ).getId() + \n );
}
@@ -192,9 +191,9 @@ public class DependencyStatusSets
{
sb.append( \n );
sb.append( The following files have NOT been resolved:\n );
-SortedSet sortedUnResolvedDependencies = new TreeSet();
-sortedUnResolvedDependencies.addAll( this.unResolvedDependencies );
-for ( Iterator i = sortedUnResolvedDependencies.iterator();
i.hasNext(); )
+Set unResolvedDependencies = new LinkedHashSet();
+unResolvedDependencies.addAll( this.unResolvedDependencies );
+for ( Iterator i = unResolvedDependencies.iterator(); i.hasNext();
)
{
sb.append( + ( (Artifact) i.next() ).getId() + \n );
}
svn commit: r1031318 - /maven/maven-2/branches/maven-2.2.x/pom.xml
Author: dennisl Date: Thu Nov 4 22:48:48 2010 New Revision: 1031318 URL: http://svn.apache.org/viewvc?rev=1031318view=rev Log: o Update to latest Wagon SNAPSHOT version to see what the grid has to say about it. Modified: maven/maven-2/branches/maven-2.2.x/pom.xml Modified: maven/maven-2/branches/maven-2.2.x/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/pom.xml?rev=1031318r1=1031317r2=1031318view=diff == --- maven/maven-2/branches/maven-2.2.x/pom.xml (original) +++ maven/maven-2/branches/maven-2.2.x/pom.xml Thu Nov 4 22:48:48 2010 @@ -234,7 +234,7 @@ under the License. properties mavenVersion2.2.2-RC1-SNAPSHOT/mavenVersion -wagonVersion1.0-beta-6/wagonVersion +wagonVersion1.0-beta-7-SNAPSHOT/wagonVersion doxiaVersion1.1/doxiaVersion /properties
svn commit: r1031348 - /maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
Author: bentmann
Date: Thu Nov 4 23:31:09 2010
New Revision: 1031348
URL: http://svn.apache.org/viewvc?rev=1031348view=rev
Log:
o Polished mojo annos
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java?rev=1031348r1=1031347r2=1031348view=diff
==
---
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
(original)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java
Thu Nov 4 23:31:09 2010
@@ -55,14 +55,15 @@ public class DisplayInfoMojo
/**
* The MavenSession
*
- * @parameter expression=${session}
+ * @parameter default-value=${session}
+ * @readonly
*/
protected MavenSession session;
/**
* POM
*
- * @parameter expression=${project}
+ * @parameter default-value=${project}
* @readonly
* @required
*/
