reverted r1100540: tests are failing and no time to find why...
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@1100552 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
index 875d6cf..2482308 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
@@ -21,7 +21,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
import java.util.List;
@@ -36,15 +35,13 @@
{
String ROLE = ArtifactMetadataSource.class.getName();
- ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories )
+ ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
throws ArtifactMetadataRetrievalException;
/**
* Resolve all relocations in the POM for this artifact, and return the new artifact coordinate.
*/
- Artifact retrieveRelocatedArtifact( Artifact artifact, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories )
+ Artifact retrieveRelocatedArtifact( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
throws ArtifactMetadataRetrievalException;
/**
@@ -58,7 +55,6 @@
* @return {@link List} $lt; {@link ArtifactVersion} >
* @throws ArtifactMetadataRetrievalException in case of error while retrieving repository metadata from the repository.
*/
- List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories )
+ List retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
throws ArtifactMetadataRetrievalException;
}
\ No newline at end of file
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
index d8e74ff..abba1d9 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java
@@ -23,12 +23,9 @@
import java.util.Map;
import java.util.Iterator;
-import org.apache.maven.artifact.Artifact;
-
-public class ManagedVersionMap
- extends HashMap<String, Artifact>
+public class ManagedVersionMap extends HashMap
{
- public ManagedVersionMap( Map<String, Artifact> map )
+ public ManagedVersionMap( Map map )
{
super();
if ( map != null )
@@ -40,7 +37,7 @@
public String toString()
{
StringBuffer buffer = new StringBuffer( "ManagedVersionMap\n" );
- Iterator<String> iter = this.keySet().iterator();
+ Iterator iter = this.keySet().iterator();
while ( iter.hasNext() )
{
String key = (String) iter.next();
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 9846da6..a343869 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -760,15 +760,16 @@
* @return a Map of plugins field with <code>Plugins#getKey()</code> as key
* @see org.apache.maven.model.Plugin#getKey()
*/
- public java.util.Map<String, Plugin> getPluginsAsMap()
+ public java.util.Map getPluginsAsMap()
{
if ( pluginMap == null )
{
- pluginMap = new java.util.LinkedHashMap<String, Plugin>();
+ pluginMap = new java.util.LinkedHashMap();
if ( plugins != null )
{
- for ( Plugin plugin : plugins )
+ for ( java.util.Iterator it = plugins.iterator(); it.hasNext(); )
{
+ Plugin plugin = (Plugin) it.next();
pluginMap.put( plugin.getKey(), plugin );
}
}
@@ -3120,15 +3121,16 @@
* @return a Map of reportSets field with <code>ReportSet#getId()</code> as key
* @see org.apache.maven.model.ReportSet#getId()
*/
- public java.util.Map<String, ReportSet> getReportSetsAsMap()
+ public java.util.Map getReportSetsAsMap()
{
if ( reportSetMap == null )
{
- reportSetMap = new java.util.LinkedHashMap<String, ReportSet>();
+ reportSetMap = new java.util.LinkedHashMap();
if ( getReportSets() != null )
{
- for ( ReportSet reportSet : getReportSets() )
+ for ( java.util.Iterator i = getReportSets().iterator(); i.hasNext(); )
{
+ ReportSet reportSet = (ReportSet) i.next();
reportSetMap.put( reportSet.getId(), reportSet );
}
}
diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index 259f773..da89003 100644
--- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -234,7 +234,7 @@
// sure this is ideal. I remove all caching from the builder and all reactor related ITs which assume
// access to simbling project resources failed.
public MavenProject buildFromRepository( Artifact artifact,
- List<ArtifactRepository> remoteArtifactRepositories,
+ List remoteArtifactRepositories,
ArtifactRepository localRepository,
boolean allowStubModel )
throws ProjectBuildingException
@@ -245,7 +245,7 @@
}
public MavenProject buildFromRepository( Artifact artifact,
- List<ArtifactRepository> remoteArtifactRepositories,
+ List remoteArtifactRepositories,
ProjectBuilderConfiguration config,
boolean allowStubModel )
throws ProjectBuildingException
@@ -266,7 +266,7 @@
}
public MavenProject buildFromRepository( Artifact artifact,
- List<ArtifactRepository> remoteArtifactRepositories,
+ List remoteArtifactRepositories,
ArtifactRepository localRepository )
throws ProjectBuildingException
{
diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
index 84a0bdd..d08d0a4 100644
--- a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
@@ -26,6 +26,7 @@
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -46,7 +47,6 @@
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Developer;
import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.Extension;
import org.apache.maven.model.IssueManagement;
import org.apache.maven.model.License;
import org.apache.maven.model.MailingList;
@@ -56,11 +56,9 @@
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Prerequisites;
-import org.apache.maven.model.Profile;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting;
-import org.apache.maven.model.Repository;
import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
@@ -98,60 +96,60 @@
private File file;
- private Set<Artifact> artifacts;
+ private Set artifacts;
private Artifact parentArtifact;
- private Set<Artifact> pluginArtifacts;
+ private Set pluginArtifacts;
- private List<ArtifactRepository> remoteArtifactRepositories;
+ private List remoteArtifactRepositories;
- private List<MavenProject> collectedProjects = Collections.emptyList();
+ private List collectedProjects = Collections.EMPTY_LIST;
- private List<Artifact> attachedArtifacts;
+ private List attachedArtifacts;
private MavenProject executionProject;
- private List<String> compileSourceRoots = new ArrayList<String>();
+ private List compileSourceRoots = new ArrayList();
- private List<String> testCompileSourceRoots = new ArrayList<String>();
+ private List testCompileSourceRoots = new ArrayList();
- private List<String> scriptSourceRoots = new ArrayList<String>();
+ private List scriptSourceRoots = new ArrayList();
- private List<ArtifactRepository> pluginArtifactRepositories;
+ private List pluginArtifactRepositories;
private ArtifactRepository releaseArtifactRepository;
private ArtifactRepository snapshotArtifactRepository;
- private List<Profile> activeProfiles = new ArrayList<Profile>();
+ private List activeProfiles = new ArrayList();
- private Set<Artifact> dependencyArtifacts;
+ private Set dependencyArtifacts;
private Artifact artifact;
// calculated.
- private Map<String, Artifact> artifactMap;
+ private Map artifactMap;
private Model originalModel;
- private Map<String, Artifact> pluginArtifactMap;
+ private Map pluginArtifactMap;
- private Set<Artifact> reportArtifacts;
+ private Set reportArtifacts;
- private Map<String, Artifact> reportArtifactMap;
+ private Map reportArtifactMap;
- private Set<Artifact> extensionArtifacts;
+ private Set extensionArtifacts;
- private Map<String, Artifact> extensionArtifactMap;
+ private Map extensionArtifactMap;
- private Map<String, Artifact> managedVersionMap;
+ private Map managedVersionMap;
- private Map<String, MavenProject> projectReferences = new HashMap<String, MavenProject>();
+ private Map projectReferences = new HashMap();
private boolean executionRoot;
- private Map<String, String> moduleAdjustments;
+ private Map moduleAdjustments;
private File basedir;
@@ -248,23 +246,23 @@
if ( project.getAttachedArtifacts() != null )
{
// clone properties modifyable by plugins in a forked lifecycle
- setAttachedArtifacts( new ArrayList<Artifact>( project.getAttachedArtifacts() ) );
+ setAttachedArtifacts( new ArrayList( project.getAttachedArtifacts() ) );
}
if ( project.getCompileSourceRoots() != null )
{
// clone source roots
- setCompileSourceRoots( ( new ArrayList<String>( project.getCompileSourceRoots() ) ) );
+ setCompileSourceRoots( ( new ArrayList( project.getCompileSourceRoots() ) ) );
}
if ( project.getTestCompileSourceRoots() != null )
{
- setTestCompileSourceRoots( ( new ArrayList<String>( project.getTestCompileSourceRoots() ) ) );
+ setTestCompileSourceRoots( ( new ArrayList( project.getTestCompileSourceRoots() ) ) );
}
if ( project.getScriptSourceRoots() != null )
{
- setScriptSourceRoots( ( new ArrayList<String>( project.getScriptSourceRoots() ) ) );
+ setScriptSourceRoots( ( new ArrayList( project.getScriptSourceRoots() ) ) );
}
setModel( ( ModelUtils.cloneModel( project.getModel() ) ) );
@@ -301,25 +299,25 @@
setDynamicBuild( ModelUtils.cloneBuild( project.getDynamicBuild() ) );
setOriginalInterpolatedBuild( ModelUtils.cloneBuild( project.getOriginalInterpolatedBuild() ) );
- List<String> dynamicRoots = project.getDynamicCompileSourceRoots();
+ List dynamicRoots = project.getDynamicCompileSourceRoots();
if ( dynamicRoots != null )
{
- setDynamicCompileSourceRoots( new ArrayList<String>( dynamicRoots ) );
- setOriginalInterpolatedCompileSourceRoots( new ArrayList<String>( project.getOriginalInterpolatedCompileSourceRoots() ) );
+ setDynamicCompileSourceRoots( new ArrayList( dynamicRoots ) );
+ setOriginalInterpolatedCompileSourceRoots( new ArrayList( project.getOriginalInterpolatedCompileSourceRoots() ) );
}
dynamicRoots = project.getDynamicTestCompileSourceRoots();
if ( dynamicRoots != null )
{
- setDynamicTestCompileSourceRoots( new ArrayList<String>( dynamicRoots ) );
- setOriginalInterpolatedTestCompileSourceRoots( new ArrayList<String>( project.getOriginalInterpolatedTestCompileSourceRoots() ) );
+ setDynamicTestCompileSourceRoots( new ArrayList( dynamicRoots ) );
+ setOriginalInterpolatedTestCompileSourceRoots( new ArrayList( project.getOriginalInterpolatedTestCompileSourceRoots() ) );
}
dynamicRoots = project.getDynamicScriptSourceRoots();
if ( dynamicRoots != null )
{
- setDynamicScriptSourceRoots( new ArrayList<String>( dynamicRoots ) );
- setOriginalInterpolatedScriptSourceRoots( new ArrayList<String>( project.getOriginalInterpolatedScriptSourceRoots() ) );
+ setDynamicScriptSourceRoots( new ArrayList( dynamicRoots ) );
+ setOriginalInterpolatedScriptSourceRoots( new ArrayList( project.getOriginalInterpolatedScriptSourceRoots() ) );
}
}
@@ -350,13 +348,14 @@
if ( moduleAdjustments == null )
{
- moduleAdjustments = new HashMap<String, String>();
+ moduleAdjustments = new HashMap();
- List<String> modules = getModules();
+ List modules = getModules();
if ( modules != null )
{
- for ( String modulePath : modules )
+ for ( Iterator it = modules.iterator(); it.hasNext(); )
{
+ String modulePath = (String) it.next();
String moduleName = modulePath;
if ( moduleName.endsWith( "/" ) || moduleName.endsWith( "\\" ) )
@@ -417,12 +416,12 @@
this.parent = parent;
}
- public void setRemoteArtifactRepositories( List<ArtifactRepository> remoteArtifactRepositories )
+ public void setRemoteArtifactRepositories( List remoteArtifactRepositories )
{
this.remoteArtifactRepositories = remoteArtifactRepositories;
}
- public List<ArtifactRepository> getRemoteArtifactRepositories()
+ public List getRemoteArtifactRepositories()
{
return remoteArtifactRepositories;
}
@@ -462,12 +461,12 @@
return basedir;
}
- public void setDependencies( List<Dependency> dependencies )
+ public void setDependencies( List dependencies )
{
getModel().setDependencies( dependencies );
}
- public List<Dependency> getDependencies()
+ public List getDependencies()
{
return getModel().getDependencies();
}
@@ -526,30 +525,32 @@
}
}
- public List<String> getCompileSourceRoots()
+ public List getCompileSourceRoots()
{
return compileSourceRoots;
}
- public List<String> getScriptSourceRoots()
+ public List getScriptSourceRoots()
{
return scriptSourceRoots;
}
- public List<String> getTestCompileSourceRoots()
+ public List getTestCompileSourceRoots()
{
return testCompileSourceRoots;
}
- public List<String> getCompileClasspathElements()
+ public List getCompileClasspathElements()
throws DependencyResolutionRequiredException
{
- List<String> list = new ArrayList<String>( getArtifacts().size() );
+ List list = new ArrayList( getArtifacts().size() );
list.add( getBuild().getOutputDirectory() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
if ( a.getArtifactHandler().isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
@@ -563,12 +564,14 @@
return list;
}
- public List<Artifact> getCompileArtifacts()
+ public List getCompileArtifacts()
{
- List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() );
+ List list = new ArrayList( getArtifacts().size() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
// TODO: classpath check doesn't belong here - that's the other method
if ( a.getArtifactHandler().isAddedToClasspath() )
{
@@ -583,19 +586,21 @@
return list;
}
- public List<Dependency> getCompileDependencies()
+ public List getCompileDependencies()
{
- Set<Artifact> artifacts = getArtifacts();
+ Set artifacts = getArtifacts();
if ( artifacts == null || artifacts.isEmpty() )
{
- return Collections.emptyList();
+ return Collections.EMPTY_LIST;
}
- List<Dependency> list = new ArrayList<Dependency>( artifacts.size() );
+ List list = new ArrayList( artifacts.size() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_PROVIDED.equals( a.getScope() )
|| Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
@@ -615,17 +620,19 @@
return list;
}
- public List<String> getTestClasspathElements()
+ public List getTestClasspathElements()
throws DependencyResolutionRequiredException
{
- List<String> list = new ArrayList<String>( getArtifacts().size() + 1 );
+ List list = new ArrayList( getArtifacts().size() + 1 );
list.add( getBuild().getTestOutputDirectory() );
list.add( getBuild().getOutputDirectory() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
if ( a.getArtifactHandler().isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
@@ -646,12 +653,14 @@
return list;
}
- public List<Artifact> getTestArtifacts()
+ public List getTestArtifacts()
{
- List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() );
+ List list = new ArrayList( getArtifacts().size() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
// TODO: classpath check doesn't belong here - that's the other method
if ( a.getArtifactHandler().isAddedToClasspath() )
{
@@ -670,19 +679,21 @@
return list;
}
- public List<Dependency> getTestDependencies()
+ public List getTestDependencies()
{
- Set<Artifact> artifacts = getArtifacts();
+ Set artifacts = getArtifacts();
if ( artifacts == null || artifacts.isEmpty() )
{
- return Collections.emptyList();
+ return Collections.EMPTY_LIST;
}
- List<Dependency> list = new ArrayList<Dependency>( artifacts.size() );
+ List list = new ArrayList( artifacts.size() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
// TODO: let the scope handler deal with this
// NOTE: [jc] scope == 'test' is the widest possible scope, so we don't really need to perform
// this check...
@@ -705,15 +716,17 @@
return list;
}
- public List<String> getRuntimeClasspathElements()
+ public List getRuntimeClasspathElements()
throws DependencyResolutionRequiredException
{
- List<String> list = new ArrayList<String>( getArtifacts().size() + 1 );
+ List list = new ArrayList( getArtifacts().size() + 1 );
list.add( getBuild().getOutputDirectory() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
if ( a.getArtifactHandler().isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
@@ -731,12 +744,14 @@
return list;
}
- public List<Artifact> getRuntimeArtifacts()
+ public List getRuntimeArtifacts()
{
- List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() );
+ List list = new ArrayList( getArtifacts().size() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
// TODO: classpath check doesn't belong here - that's the other method
if ( a.getArtifactHandler().isAddedToClasspath() )
{
@@ -750,19 +765,21 @@
return list;
}
- public List<Dependency> getRuntimeDependencies()
+ public List getRuntimeDependencies()
{
- Set<Artifact> artifacts = getArtifacts();
+ Set artifacts = getArtifacts();
if ( artifacts == null || artifacts.isEmpty() )
{
- return Collections.emptyList();
+ return Collections.EMPTY_LIST;
}
- List<Dependency> list = new ArrayList<Dependency>( artifacts.size() );
+ List list = new ArrayList( artifacts.size() );
- for ( Artifact a : artifacts )
+ for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_COMPILE.equals( a.getScope() ) || Artifact.SCOPE_RUNTIME.equals( a.getScope() ) )
{
@@ -781,15 +798,17 @@
return list;
}
- public List<String> getSystemClasspathElements()
+ public List getSystemClasspathElements()
throws DependencyResolutionRequiredException
{
- List<String> list = new ArrayList<String>( getArtifacts().size() );
+ List list = new ArrayList( getArtifacts().size() );
list.add( getBuild().getOutputDirectory() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
if ( a.getArtifactHandler().isAddedToClasspath() )
{
// TODO: let the scope handler deal with this
@@ -802,12 +821,14 @@
return list;
}
- public List<Artifact> getSystemArtifacts()
+ public List getSystemArtifacts()
{
- List<Artifact> list = new ArrayList<Artifact>( getArtifacts().size() );
+ List list = new ArrayList( getArtifacts().size() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
// TODO: classpath check doesn't belong here - that's the other method
if ( a.getArtifactHandler().isAddedToClasspath() )
{
@@ -821,19 +842,21 @@
return list;
}
- public List<Dependency> getSystemDependencies()
+ public List getSystemDependencies()
{
- Set<Artifact> artifacts = getArtifacts();
+ Set artifacts = getArtifacts();
if ( artifacts == null || artifacts.isEmpty() )
{
- return Collections.emptyList();
+ return Collections.EMPTY_LIST;
}
- List<Dependency> list = new ArrayList<Dependency>( artifacts.size() );
+ List list = new ArrayList( artifacts.size() );
- for ( Artifact a : getArtifacts() )
+ for ( Iterator i = getArtifacts().iterator(); i.hasNext(); )
{
+ Artifact a = (Artifact) i.next();
+
// TODO: let the scope handler deal with this
if ( Artifact.SCOPE_SYSTEM.equals( a.getScope() ) )
{
@@ -1028,12 +1051,12 @@
return getModel().getScm();
}
- public void setMailingLists( List<MailingList> mailingLists )
+ public void setMailingLists( List mailingLists )
{
getModel().setMailingLists( mailingLists );
}
- public List<MailingList> getMailingLists()
+ public List getMailingLists()
{
return getModel().getMailingLists();
}
@@ -1043,12 +1066,12 @@
getModel().addMailingList( mailingList );
}
- public void setDevelopers( List<Developer> developers )
+ public void setDevelopers( List developers )
{
getModel().setDevelopers( developers );
}
- public List<Developer> getDevelopers()
+ public List getDevelopers()
{
return getModel().getDevelopers();
}
@@ -1058,12 +1081,12 @@
getModel().addDeveloper( developer );
}
- public void setContributors( List<Contributor> contributors )
+ public void setContributors( List contributors )
{
getModel().setContributors( contributors );
}
- public List<Contributor> getContributors()
+ public List getContributors()
{
return getModel().getContributors();
}
@@ -1083,12 +1106,12 @@
return getModelBuild();
}
- public List<Resource> getResources()
+ public List getResources()
{
return getBuild().getResources();
}
- public List<Resource> getTestResources()
+ public List getTestResources()
{
return getBuild().getTestResources();
}
@@ -1113,12 +1136,12 @@
return getModel().getReporting();
}
- public void setLicenses( List<License> licenses )
+ public void setLicenses( List licenses )
{
getModel().setLicenses( licenses );
}
- public List<License> getLicenses()
+ public List getLicenses()
{
return getModel().getLicenses();
}
@@ -1128,7 +1151,7 @@
getModel().addLicense( license );
}
- public void setArtifacts( Set<Artifact> artifacts )
+ public void setArtifacts( Set artifacts )
{
this.artifacts = artifacts;
@@ -1143,12 +1166,12 @@
* @return {@link Set} < {@link Artifact} >
* @see #getDependencyArtifacts() to get only direct dependencies
*/
- public Set<Artifact> getArtifacts()
+ public Set getArtifacts()
{
- return artifacts == null ? Collections.<Artifact>emptySet() : artifacts;
+ return artifacts == null ? Collections.EMPTY_SET : artifacts;
}
- public Map<String, Artifact> getArtifactMap()
+ public Map getArtifactMap()
{
if ( artifactMap == null )
{
@@ -1158,19 +1181,19 @@
return artifactMap;
}
- public void setPluginArtifacts( Set<Artifact> pluginArtifacts )
+ public void setPluginArtifacts( Set pluginArtifacts )
{
this.pluginArtifacts = pluginArtifacts;
this.pluginArtifactMap = null;
}
- public Set<Artifact> getPluginArtifacts()
+ public Set getPluginArtifacts()
{
return pluginArtifacts;
}
- public Map<String, Artifact> getPluginArtifactMap()
+ public Map getPluginArtifactMap()
{
if ( pluginArtifactMap == null )
{
@@ -1180,19 +1203,19 @@
return pluginArtifactMap;
}
- public void setReportArtifacts( Set<Artifact> reportArtifacts )
+ public void setReportArtifacts( Set reportArtifacts )
{
this.reportArtifacts = reportArtifacts;
this.reportArtifactMap = null;
}
- public Set<Artifact> getReportArtifacts()
+ public Set getReportArtifacts()
{
return reportArtifacts;
}
- public Map<String, Artifact> getReportArtifactMap()
+ public Map getReportArtifactMap()
{
if ( reportArtifactMap == null )
{
@@ -1202,19 +1225,19 @@
return reportArtifactMap;
}
- public void setExtensionArtifacts( Set<Artifact> extensionArtifacts )
+ public void setExtensionArtifacts( Set extensionArtifacts )
{
this.extensionArtifacts = extensionArtifacts;
this.extensionArtifactMap = null;
}
- public Set<Artifact> getExtensionArtifacts()
+ public Set getExtensionArtifacts()
{
return this.extensionArtifacts;
}
- public Map<String, Artifact> getExtensionArtifactMap()
+ public Map getExtensionArtifactMap()
{
if ( extensionArtifactMap == null )
{
@@ -1234,7 +1257,7 @@
return parentArtifact;
}
- public List<Repository> getRepositories()
+ public List getRepositories()
{
return getModel().getRepositories();
}
@@ -1243,7 +1266,7 @@
// Plugins
// ----------------------------------------------------------------------
- public List<ReportPlugin> getReportPlugins()
+ public List getReportPlugins()
{
if ( getModel().getReporting() == null )
{
@@ -1253,7 +1276,7 @@
}
- public List<Plugin> getBuildPlugins()
+ public List getBuildPlugins()
{
if ( getModel().getBuild() == null )
{
@@ -1262,7 +1285,7 @@
return getModel().getBuild().getPlugins();
}
- public List<String> getModules()
+ public List getModules()
{
return getModel().getModules();
}
@@ -1313,30 +1336,30 @@
if ( pm != null )
{
- Map<String, Plugin> pmByKey = pm.getPluginsAsMap();
+ Map pmByKey = pm.getPluginsAsMap();
String pluginKey = plugin.getKey();
if ( pmByKey != null && pmByKey.containsKey( pluginKey ) )
{
- Plugin pmPlugin = pmByKey.get( pluginKey );
+ Plugin pmPlugin = (Plugin) pmByKey.get( pluginKey );
ModelUtils.mergePluginDefinitions( plugin, pmPlugin, false );
}
}
}
- public List<MavenProject> getCollectedProjects()
+ public List getCollectedProjects()
{
return collectedProjects;
}
- public void setCollectedProjects( List<MavenProject> collectedProjects )
+ public void setCollectedProjects( List collectedProjects )
{
this.collectedProjects = collectedProjects;
}
- public void setPluginArtifactRepositories( List<ArtifactRepository> pluginArtifactRepositories )
+ public void setPluginArtifactRepositories( List pluginArtifactRepositories )
{
this.pluginArtifactRepositories = pluginArtifactRepositories;
}
@@ -1345,7 +1368,7 @@
* @return a list of ArtifactRepository objects constructed
* from the Repository objects returned by getPluginRepositories.
*/
- public List<ArtifactRepository> getPluginArtifactRepositories()
+ public List getPluginArtifactRepositories()
{
return pluginArtifactRepositories;
}
@@ -1356,17 +1379,17 @@
: getReleaseArtifactRepository();
}
- public List<Repository> getPluginRepositories()
+ public List getPluginRepositories()
{
return getModel().getPluginRepositories();
}
- public void setActiveProfiles( List<Profile> activeProfiles )
+ public void setActiveProfiles( List activeProfiles )
{
this.activeProfiles.addAll( activeProfiles );
}
- public List<Profile> getActiveProfiles()
+ public List getActiveProfiles()
{
return activeProfiles;
}
@@ -1376,11 +1399,11 @@
getAttachedArtifacts().add( artifact );
}
- public List<Artifact> getAttachedArtifacts()
+ public List getAttachedArtifacts()
{
if ( attachedArtifacts == null )
{
- attachedArtifacts = new ArrayList<Artifact>();
+ attachedArtifacts = new ArrayList();
}
return attachedArtifacts;
}
@@ -1398,8 +1421,10 @@
if ( getBuildPlugins() != null )
{
- for ( Plugin plugin : getBuildPlugins() )
+ for ( Iterator iterator = getBuildPlugins().iterator(); iterator.hasNext(); )
{
+ Plugin plugin = (Plugin) iterator.next();
+
if ( pluginGroupId.equals( plugin.getGroupId() ) && pluginArtifactId.equals( plugin.getArtifactId() ) )
{
dom = (Xpp3Dom) plugin.getConfiguration();
@@ -1474,15 +1499,17 @@
if ( getReportPlugins() != null )
{
- for ( ReportPlugin plugin : getReportPlugins() )
+ for ( Iterator iterator = getReportPlugins().iterator(); iterator.hasNext(); )
{
+ ReportPlugin plugin = (ReportPlugin) iterator.next();
+
if ( pluginGroupId.equals( plugin.getGroupId() ) && pluginArtifactId.equals( plugin.getArtifactId() ) )
{
dom = (Xpp3Dom) plugin.getConfiguration();
if ( reportSetId != null )
{
- ReportSet reportSet = plugin.getReportSetsAsMap().get( reportSetId );
+ ReportSet reportSet = (ReportSet) plugin.getReportSetsAsMap().get( reportSetId );
if ( reportSet != null )
{
Xpp3Dom executionConfiguration = (Xpp3Dom) reportSet.getConfiguration();
@@ -1538,12 +1565,12 @@
* @return {@link Set} < {@link Artifact} >
* @see #getArtifacts() to get all transitive dependencies
*/
- public Set<Artifact> getDependencyArtifacts()
+ public Set getDependencyArtifacts()
{
return dependencyArtifacts;
}
- public void setDependencyArtifacts( Set<Artifact> dependencyArtifacts )
+ public void setDependencyArtifacts( Set dependencyArtifacts )
{
this.dependencyArtifacts = dependencyArtifacts;
}
@@ -1568,17 +1595,16 @@
return originalModel;
}
- public void setManagedVersionMap( Map<String, Artifact> map )
+ public void setManagedVersionMap( Map map )
{
this.managedVersionMap = map;
}
- public Map<String, Artifact> getManagedVersionMap()
+ public Map getManagedVersionMap()
{
return this.managedVersionMap;
}
- @Override
public boolean equals( Object other )
{
if ( other == this )
@@ -1597,18 +1623,17 @@
}
}
- @Override
public int hashCode()
{
return getId().hashCode();
}
- public List<Extension> getBuildExtensions()
+ public List getBuildExtensions()
{
Build build = getBuild();
if ( build == null || build.getExtensions() == null )
{
- return Collections.emptyList();
+ return Collections.EMPTY_LIST;
}
else
{
@@ -1620,7 +1645,7 @@
* @todo the lazy initialisation of this makes me uneasy.
* @return {@link Set} < {@link Artifact} >
*/
- public Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, String inheritedScope,
+ public Set createArtifacts( ArtifactFactory artifactFactory, String inheritedScope,
ArtifactFilter dependencyFilter )
throws InvalidDependencyVersionException
{
@@ -1650,12 +1675,12 @@
return getModel().getProperties();
}
- public List<String> getFilters()
+ public List getFilters()
{
return getBuild().getFilters();
}
- public Map<String, MavenProject> getProjectReferences()
+ public Map getProjectReferences()
{
return projectReferences;
}
@@ -1681,22 +1706,22 @@
this.model = model;
}
- protected void setAttachedArtifacts( List<Artifact> attachedArtifacts )
+ protected void setAttachedArtifacts( List attachedArtifacts )
{
this.attachedArtifacts = attachedArtifacts;
}
- protected void setCompileSourceRoots( List<String> compileSourceRoots )
+ protected void setCompileSourceRoots( List compileSourceRoots )
{
this.compileSourceRoots = compileSourceRoots;
}
- protected void setTestCompileSourceRoots( List<String> testCompileSourceRoots )
+ protected void setTestCompileSourceRoots( List testCompileSourceRoots )
{
this.testCompileSourceRoots = testCompileSourceRoots;
}
- protected void setScriptSourceRoots( List<String> scriptSourceRoots )
+ protected void setScriptSourceRoots( List scriptSourceRoots )
{
this.scriptSourceRoots = scriptSourceRoots;
}
@@ -1713,17 +1738,18 @@
public void resolveActiveArtifacts()
{
- Set<Artifact> depArtifacts = getDependencyArtifacts();
+ Set depArtifacts = getDependencyArtifacts();
if ( depArtifacts == null )
{
return;
}
- Set<Artifact> updated = new LinkedHashSet<Artifact>( depArtifacts.size() );
+ Set updated = new LinkedHashSet( depArtifacts.size() );
int updatedCount = 0;
- for ( Artifact depArtifact : depArtifacts )
+ for ( Iterator it = depArtifacts.iterator(); it.hasNext(); )
{
+ Artifact depArtifact = (Artifact) it.next();
Artifact replaced = replaceWithActiveArtifact( depArtifact );
if ( depArtifact != replaced )
@@ -1790,14 +1816,15 @@
* @param requestedArtifact The artifact to resolve, must not be <code>null</code>.
* @return The matching artifact or <code>null</code> if not found.
*/
- private Artifact findMatchingArtifact( List<Artifact> artifacts, Artifact requestedArtifact )
+ private Artifact findMatchingArtifact( List artifacts, Artifact requestedArtifact )
{
if ( artifacts != null && !artifacts.isEmpty() )
{
// first try matching by dependency conflict id
String requestedId = requestedArtifact.getDependencyConflictId();
- for ( Artifact artifact : artifacts )
+ for ( Iterator it = artifacts.iterator(); it.hasNext(); )
{
+ Artifact artifact = (Artifact) it.next();
if ( requestedId.equals( artifact.getDependencyConflictId() ) )
{
return artifact;
@@ -1806,8 +1833,9 @@
// next try matching by repository conflict id
requestedId = getRepositoryConflictId( requestedArtifact );
- for ( Artifact artifact : artifacts )
+ for ( Iterator it = artifacts.iterator(); it.hasNext(); )
{
+ Artifact artifact = (Artifact) it.next();
if ( requestedId.equals( getRepositoryConflictId( artifact ) ) )
{
return artifact;
@@ -1871,7 +1899,7 @@
}
}
- private void addArtifactPath( Artifact a, List<String> list )
+ private void addArtifactPath( Artifact a, List list )
throws DependencyResolutionRequiredException
{
File file = a.getFile();
@@ -1912,7 +1940,6 @@
* @throws CloneNotSupportedException
* @since 2.0.9
*/
- @Override
public Object clone()
throws CloneNotSupportedException
{
@@ -1929,17 +1956,17 @@
private Build originalInterpolatedBuild;
- private List<String> dynamicCompileSourceRoots;
+ private List dynamicCompileSourceRoots;
- private List<String> originalInterpolatedCompileSourceRoots;
+ private List originalInterpolatedCompileSourceRoots;
- private List<String> dynamicTestCompileSourceRoots;
+ private List dynamicTestCompileSourceRoots;
- private List<String> originalInterpolatedTestCompileSourceRoots;
+ private List originalInterpolatedTestCompileSourceRoots;
- private List<String> dynamicScriptSourceRoots;
+ private List dynamicScriptSourceRoots;
- private List<String> originalInterpolatedScriptSourceRoots;
+ private List originalInterpolatedScriptSourceRoots;
private boolean isConcrete = false;
@@ -1963,32 +1990,32 @@
return originalInterpolatedBuild;
}
- public List<String> getDynamicCompileSourceRoots()
+ public List getDynamicCompileSourceRoots()
{
return dynamicCompileSourceRoots;
}
- public List<String> getOriginalInterpolatedCompileSourceRoots()
+ public List getOriginalInterpolatedCompileSourceRoots()
{
return originalInterpolatedCompileSourceRoots;
}
- public List<String> getDynamicTestCompileSourceRoots()
+ public List getDynamicTestCompileSourceRoots()
{
return dynamicTestCompileSourceRoots;
}
- public List<String> getOriginalInterpolatedTestCompileSourceRoots()
+ public List getOriginalInterpolatedTestCompileSourceRoots()
{
return originalInterpolatedTestCompileSourceRoots;
}
- public List<String> getDynamicScriptSourceRoots()
+ public List getDynamicScriptSourceRoots()
{
return dynamicScriptSourceRoots;
}
- public List<String> getOriginalInterpolatedScriptSourceRoots()
+ public List getOriginalInterpolatedScriptSourceRoots()
{
return originalInterpolatedScriptSourceRoots;
}
@@ -2009,19 +2036,19 @@
originalInterpolatedBuild = null;
}
- public void preserveCompileSourceRoots( List<String> originalInterpolatedCompileSourceRoots )
+ public void preserveCompileSourceRoots( List originalInterpolatedCompileSourceRoots )
{
dynamicCompileSourceRoots = getCompileSourceRoots();
this.originalInterpolatedCompileSourceRoots = originalInterpolatedCompileSourceRoots;
}
- public void preserveTestCompileSourceRoots( List<String> originalInterpolatedTestCompileSourceRoots )
+ public void preserveTestCompileSourceRoots( List originalInterpolatedTestCompileSourceRoots )
{
dynamicTestCompileSourceRoots = getTestCompileSourceRoots();
this.originalInterpolatedTestCompileSourceRoots = originalInterpolatedTestCompileSourceRoots;
}
- public void preserveScriptSourceRoots( List<String> originalInterpolatedScriptSourceRoots )
+ public void preserveScriptSourceRoots( List originalInterpolatedScriptSourceRoots )
{
dynamicScriptSourceRoots = getScriptSourceRoots();
this.originalInterpolatedScriptSourceRoots = originalInterpolatedScriptSourceRoots;
@@ -2046,32 +2073,32 @@
this.originalInterpolatedBuild = originalInterpolatedBuild;
}
- protected void setDynamicCompileSourceRoots( List<String> dynamicCompileSourceRoots )
+ protected void setDynamicCompileSourceRoots( List dynamicCompileSourceRoots )
{
this.dynamicCompileSourceRoots = dynamicCompileSourceRoots;
}
- protected void setOriginalInterpolatedCompileSourceRoots( List<String> originalInterpolatedCompileSourceRoots )
+ protected void setOriginalInterpolatedCompileSourceRoots( List originalInterpolatedCompileSourceRoots )
{
this.originalInterpolatedCompileSourceRoots = originalInterpolatedCompileSourceRoots;
}
- protected void setDynamicTestCompileSourceRoots( List<String> dynamicTestCompileSourceRoots )
+ protected void setDynamicTestCompileSourceRoots( List dynamicTestCompileSourceRoots )
{
this.dynamicTestCompileSourceRoots = dynamicTestCompileSourceRoots;
}
- protected void setOriginalInterpolatedTestCompileSourceRoots( List<String> originalInterpolatedTestCompileSourceRoots )
+ protected void setOriginalInterpolatedTestCompileSourceRoots( List originalInterpolatedTestCompileSourceRoots )
{
this.originalInterpolatedTestCompileSourceRoots = originalInterpolatedTestCompileSourceRoots;
}
- protected void setDynamicScriptSourceRoots( List<String> dynamicScriptSourceRoots )
+ protected void setDynamicScriptSourceRoots( List dynamicScriptSourceRoots )
{
this.dynamicScriptSourceRoots = dynamicScriptSourceRoots;
}
- protected void setOriginalInterpolatedScriptSourceRoots( List<String> originalInterpolatedScriptSourceRoots )
+ protected void setOriginalInterpolatedScriptSourceRoots( List originalInterpolatedScriptSourceRoots )
{
this.originalInterpolatedScriptSourceRoots = originalInterpolatedScriptSourceRoots;
}
@@ -2089,7 +2116,7 @@
if ( p != null )
{
preservedProperties = new Properties();
- for ( Enumeration<?> e = p.propertyNames(); e.hasMoreElements(); )
+ for ( Enumeration e = p.propertyNames(); e.hasMoreElements(); )
{
String key = (String) e.nextElement();
preservedProperties.setProperty( key, p.getProperty( key ) );
diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index 8799207..bb29b17 100644
--- a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -72,7 +72,7 @@
* @return the built project
* @throws ProjectBuildingException
*/
- MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteArtifactRepositories,
+ MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories,
ArtifactRepository localRepository )
throws ProjectBuildingException;
@@ -86,7 +86,7 @@
* @return the built project
* @throws ProjectBuildingException
*/
- MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteArtifactRepositories,
+ MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories,
ArtifactRepository localRepository, boolean allowStubModel )
throws ProjectBuildingException;
@@ -102,7 +102,7 @@
* @return the built project
* @throws ProjectBuildingException
*/
- MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteArtifactRepositories,
+ MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories,
ProjectBuilderConfiguration configuration, boolean allowStubModel )
throws ProjectBuildingException;
diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index ae40b81..26ec543 100644
--- a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -106,7 +106,7 @@
/**
* Resolve all relocations in the POM for this artifact, and return the new artifact coordinate.
*/
- public Artifact retrieveRelocatedArtifact( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+ public Artifact retrieveRelocatedArtifact( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
throws ArtifactMetadataRetrievalException
{
if ( artifact instanceof ActiveProjectArtifact )
@@ -162,8 +162,7 @@
return artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion();
}
- private ProjectRelocation retrieveRelocatedProject( Artifact artifact, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories )
+ private ProjectRelocation retrieveRelocatedProject( Artifact artifact, ArtifactRepository localRepository, List remoteRepositories )
throws ArtifactMetadataRetrievalException
{
MavenProject project = null;
@@ -443,15 +442,16 @@
* @todo desperately needs refactoring. It's just here because it's implementation is maven-project specific
* @return {@link Set} < {@link Artifact} >
*/
- public static Set<Artifact> createArtifacts( ArtifactFactory artifactFactory, List<Dependency> dependencies,
- String inheritedScope, ArtifactFilter dependencyFilter,
- MavenProject project )
+ public static Set createArtifacts( ArtifactFactory artifactFactory, List dependencies, String inheritedScope,
+ ArtifactFilter dependencyFilter, MavenProject project )
throws InvalidDependencyVersionException
{
- Set<Artifact> projectArtifacts = new LinkedHashSet<Artifact>( dependencies.size() );
+ Set projectArtifacts = new LinkedHashSet( dependencies.size() );
- for ( Dependency d : dependencies )
+ for ( Iterator i = dependencies.iterator(); i.hasNext(); )
{
+ Dependency d = (Dependency) i.next();
+
String scope = d.getScope();
if ( StringUtils.isEmpty( scope ) )
