What is the problem with this commit regarding the scope of what John is trying to do wrt to 2.2?
I thought Maven 2.2 requiring Java 5 was about to use typed collections: then every enhancement to use typed collections is in the scopen, no? Is there something I'm missing? FYI, I'm not a Java 5 expert (yes, I'm still stuck with 1.4...): my comprehension of typed collections is still very theoritical, without knowledge of real world problems when using them. regards, Hervé Le samedi 02 mai 2009, nicolas de loof a écrit : > Do we prefer plugin developers to use List<?> and get ClassCastExceptions > at runtime or sue type-safe collections to help them create stronger code > ?Anyway, few plugins allready use Java5. Java 1.4 based one will not be > broken as the generics signature is only a compile-time check. > > > 2009/5/1 Brian Fox <[email protected]> > > > I'm not sure if this is in scope of what John is trying to do wrt to 2.2. > > > > Jason van Zyl wrote: > >> I don't believe anyone actually agreed to this yet. Are you sure this is > >> not going to cause problems for users? > >> > >> On 1-May-09, at 1:04 AM, [email protected] wrote: > >> > >> Author: nicolas > >> > >>> Date: Fri May 1 08:04:48 2009 > >>> New Revision: 770570 > >>> > >>> URL: http://svn.apache.org/viewvc?rev=770570&view=rev > >>> Log: > >>> use java5 syntax. > >>> -> set modello to generate java5 syntax > >>> -> MavenProject updated to use generics on collections & methods for > >>> better type safety > >>> > >>> Modified: > >>> > >>> maven/components/branches/maven-2.2.x/maven-artifact/src/main/java/org/ > >>>apache/maven/artifact/ArtifactUtils.java > >>> > >>> maven/components/branches/maven-2.2.x/maven-model/pom.xml > >>> maven/components/branches/maven-2.2.x/maven-profile/pom.xml > >>> > >>> maven/components/branches/maven-2.2.x/maven-project/src/main/java/org/a > >>>pache/maven/project/MavenProject.java > >>> > >>> > >>> maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml > >>> maven/components/branches/maven-2.2.x/maven-settings/pom.xml > >>> maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml > >>> > >>> Modified: > >>> maven/components/branches/maven-2.2.x/maven-artifact/src/main/java/org/ > >>>apache/maven/artifact/ArtifactUtils.java > >>> > >>> URL: > >>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/mave > >>>n-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java?re > >>>v=770570&r1=770569&r2=770570&view=diff > >>> ======================================================================= > >>>======= > >>> > >>> --- > >>> maven/components/branches/maven-2.2.x/maven-artifact/src/main/java/org/ > >>>apache/maven/artifact/ArtifactUtils.java (original) > >>> +++ > >>> maven/components/branches/maven-2.2.x/maven-artifact/src/main/java/org/ > >>>apache/maven/artifact/ArtifactUtils.java Fri May 1 08:04:48 2009 > >>> @@ -86,13 +86,13 @@ > >>> baseVersion; > >>> } > >>> > >>> - public static Map artifactMapByVersionlessId( Collection artifacts > >>> ) + public static Map<String, Artifact> artifactMapByVersionlessId( > >>> Collection<Artifact> artifacts ) > >>> { > >>> - Map artifactMap = new LinkedHashMap(); > >>> + Map<String, Artifact> artifactMap = new LinkedHashMap<String, > >>> Artifact>(); > >>> > >>> if ( artifacts != null ) > >>> { > >>> - for ( Iterator it = artifacts.iterator(); it.hasNext(); ) > >>> + for ( Iterator<Artifact> it = artifacts.iterator(); > >>> it.hasNext(); ) > >>> { > >>> Artifact artifact = (Artifact) it.next(); > >>> > >>> > >>> Modified: maven/components/branches/maven-2.2.x/maven-model/pom.xml > >>> URL: > >>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/mave > >>>n-model/pom.xml?rev=770570&r1=770569&r2=770570&view=diff > >>> ======================================================================= > >>>======= > >>> > >>> --- maven/components/branches/maven-2.2.x/maven-model/pom.xml > >>> (original) +++ > >>> maven/components/branches/maven-2.2.x/maven-model/pom.xml Fri May 1 > >>> 08:04:48 2009 > >>> @@ -47,6 +47,7 @@ > >>> <models> > >>> <model>src/main/mdo/maven.mdo</model> > >>> </models> > >>> + <useJava5>true</useJava5> > >>> </configuration> > >>> </plugin> > >>> <plugin> > >>> > >>> Modified: maven/components/branches/maven-2.2.x/maven-profile/pom.xml > >>> URL: > >>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/mave > >>>n-profile/pom.xml?rev=770570&r1=770569&r2=770570&view=diff > >>> ======================================================================= > >>>======= > >>> > >>> --- maven/components/branches/maven-2.2.x/maven-profile/pom.xml > >>> (original) > >>> +++ maven/components/branches/maven-2.2.x/maven-profile/pom.xml Fri May > >>> 1 08:04:48 2009 > >>> @@ -54,6 +54,7 @@ > >>> <models> > >>> <model>src/main/mdo/profiles.mdo</model> > >>> </models> > >>> + <useJava5>true</useJava5> > >>> </configuration> > >>> </plugin> > >>> </plugins> > >>> > >>> Modified: > >>> maven/components/branches/maven-2.2.x/maven-project/src/main/java/org/a > >>>pache/maven/project/MavenProject.java > >>> > >>> URL: > >>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/mave > >>>n-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=7 > >>>70570&r1=770569&r2=770570&view=diff > >>> ======================================================================= > >>>======= > >>> > >>> --- > >>> maven/components/branches/maven-2.2.x/maven-project/src/main/java/org/a > >>>pache/maven/project/MavenProject.java (original) > >>> +++ > >>> maven/components/branches/maven-2.2.x/maven-project/src/main/java/org/a > >>>pache/maven/project/MavenProject.java Fri May 1 08:04:48 2009 > >>> @@ -36,10 +36,11 @@ > >>> import org.apache.maven.artifact.Artifact; > >>> import org.apache.maven.artifact.ArtifactUtils; > >>> import org.apache.maven.artifact.DependencyResolutionRequiredException; > >>> -import org.apache.maven.artifact.versioning.ManagedVersionMap; > >>> import org.apache.maven.artifact.factory.ArtifactFactory; > >>> import org.apache.maven.artifact.repository.ArtifactRepository; > >>> import org.apache.maven.artifact.resolver.filter.ArtifactFilter; > >>> +import org.apache.maven.artifact.versioning.ArtifactVersion; > >>> +import org.apache.maven.artifact.versioning.ManagedVersionMap; > >>> import org.apache.maven.model.Build; > >>> import org.apache.maven.model.CiManagement; > >>> import org.apache.maven.model.Contributor; > >>> @@ -47,6 +48,7 @@ > >>> 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; > >>> @@ -59,6 +61,7 @@ > >>> 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; > >>> @@ -96,60 +99,60 @@ > >>> > >>> private File file; > >>> > >>> - private Set artifacts; > >>> + private Set<Artifact> artifacts; > >>> > >>> private Artifact parentArtifact; > >>> > >>> - private Set pluginArtifacts; > >>> + private Set<Artifact> pluginArtifacts; > >>> > >>> - private List remoteArtifactRepositories; > >>> + private List<ArtifactRepository> remoteArtifactRepositories; > >>> > >>> - private List collectedProjects = Collections.EMPTY_LIST; > >>> + private List<MavenProject> collectedProjects = > >>> Collections.<MavenProject> emptyList(); > >>> > >>> - private List attachedArtifacts; > >>> + private List<Artifact> attachedArtifacts; > >>> > >>> private MavenProject executionProject; > >>> > >>> - private List compileSourceRoots = new ArrayList(); > >>> + private List<String> compileSourceRoots = new ArrayList<String>(); > >>> > >>> - private List testCompileSourceRoots = new ArrayList(); > >>> + private List<String> testCompileSourceRoots = new > >>> ArrayList<String>(); > >>> > >>> - private List scriptSourceRoots = new ArrayList(); > >>> + private List<String> scriptSourceRoots = new ArrayList<String>(); > >>> > >>> - private List pluginArtifactRepositories; > >>> + private List<ArtifactRepository> pluginArtifactRepositories; > >>> > >>> private ArtifactRepository releaseArtifactRepository; > >>> > >>> private ArtifactRepository snapshotArtifactRepository; > >>> > >>> - private List activeProfiles = new ArrayList(); > >>> + private List<String> activeProfiles = new ArrayList<String>(); > >>> > >>> - private Set dependencyArtifacts; > >>> + private Set<Artifact> dependencyArtifacts; > >>> > >>> private Artifact artifact; > >>> > >>> // calculated. > >>> - private Map artifactMap; > >>> + private Map<String, Artifact> artifactMap; > >>> > >>> private Model originalModel; > >>> > >>> - private Map pluginArtifactMap; > >>> + private Map<String, Artifact> pluginArtifactMap; > >>> > >>> - private Set reportArtifacts; > >>> + private Set<Artifact> reportArtifacts; > >>> > >>> - private Map reportArtifactMap; > >>> + private Map<String, Artifact> reportArtifactMap; > >>> > >>> - private Set extensionArtifacts; > >>> + private Set<Artifact> extensionArtifacts; > >>> > >>> - private Map extensionArtifactMap; > >>> + private Map<String, Artifact> extensionArtifactMap; > >>> > >>> - private Map managedVersionMap; > >>> + private Map<String, ArtifactVersion> managedVersionMap; > >>> > >>> - private Map projectReferences = new HashMap(); > >>> + private Map<String, MavenProject> projectReferences = new > >>> HashMap<String, MavenProject>(); > >>> > >>> private boolean executionRoot; > >>> > >>> - private Map moduleAdjustments; > >>> + private Map<String, String> moduleAdjustments; > >>> > >>> private File basedir; > >>> > >>> @@ -245,23 +248,23 @@ > >>> if ( project.getAttachedArtifacts() != null ) > >>> { > >>> // clone properties modifyable by plugins in a forked > >>> lifecycle > >>> - setAttachedArtifacts( new ArrayList( > >>> project.getAttachedArtifacts() ) ); > >>> + setAttachedArtifacts( new ArrayList<Artifact>( > >>> project.getAttachedArtifacts() ) ); > >>> } > >>> > >>> if ( project.getCompileSourceRoots() != null ) > >>> { > >>> // clone source roots > >>> - setCompileSourceRoots( ( new ArrayList( > >>> project.getCompileSourceRoots() ) ) ); > >>> + setCompileSourceRoots( ( new ArrayList<String>( > >>> project.getCompileSourceRoots() ) ) ); > >>> } > >>> > >>> if ( project.getTestCompileSourceRoots() != null ) > >>> { > >>> - setTestCompileSourceRoots( ( new ArrayList( > >>> project.getTestCompileSourceRoots() ) ) ); > >>> + setTestCompileSourceRoots( ( new ArrayList<String>( > >>> project.getTestCompileSourceRoots() ) ) ); > >>> } > >>> > >>> if ( project.getScriptSourceRoots() != null ) > >>> { > >>> - setScriptSourceRoots( ( new ArrayList( > >>> project.getScriptSourceRoots() ) ) ); > >>> + setScriptSourceRoots( ( new ArrayList<String>( > >>> project.getScriptSourceRoots() ) ) ); > >>> } > >>> > >>> setModel( ( ModelUtils.cloneModel( project.getModel() ) ) ); > >>> @@ -298,25 +301,25 @@ > >>> setDynamicBuild( ModelUtils.cloneBuild( > >>> project.getDynamicBuild() ) ); > >>> setOriginalInterpolatedBuild( ModelUtils.cloneBuild( > >>> project.getOriginalInterpolatedBuild() ) ); > >>> > >>> - List dynamicRoots = > >>> project.getDynamicCompileSourceRoots(); + List<String> > >>> dynamicRoots = > >>> project.getDynamicCompileSourceRoots(); > >>> if ( dynamicRoots != null ) > >>> { > >>> - setDynamicCompileSourceRoots( new ArrayList( > >>> dynamicRoots ) ); > >>> - setOriginalInterpolatedCompileSourceRoots( new > >>> ArrayList( project.getOriginalInterpolatedCompileSourceRoots() ) ); > >>> + setDynamicCompileSourceRoots( new ArrayList<String>( > >>> dynamicRoots ) ); > >>> + setOriginalInterpolatedCompileSourceRoots( new > >>> ArrayList<String>( project.getOriginalInterpolatedCompileSourceRoots() > >>> ) ); } > >>> > >>> dynamicRoots = project.getDynamicTestCompileSourceRoots(); > >>> if ( dynamicRoots != null ) > >>> { > >>> - setDynamicTestCompileSourceRoots( new ArrayList( > >>> dynamicRoots ) ); > >>> - setOriginalInterpolatedTestCompileSourceRoots( new > >>> ArrayList( project.getOriginalInterpolatedTestCompileSourceRoots() ) ); > >>> + setDynamicTestCompileSourceRoots( new > >>> ArrayList<String>( dynamicRoots ) ); > >>> + setOriginalInterpolatedTestCompileSourceRoots( new > >>> ArrayList<String>( > >>> project.getOriginalInterpolatedTestCompileSourceRoots() ) ); > >>> } > >>> > >>> dynamicRoots = project.getDynamicScriptSourceRoots(); > >>> if ( dynamicRoots != null ) > >>> { > >>> - setDynamicScriptSourceRoots( new ArrayList( > >>> dynamicRoots ) ); > >>> - setOriginalInterpolatedScriptSourceRoots( new > >>> ArrayList( project.getOriginalInterpolatedScriptSourceRoots() ) ); > >>> + setDynamicScriptSourceRoots( new ArrayList<String>( > >>> dynamicRoots ) ); > >>> + setOriginalInterpolatedScriptSourceRoots( new > >>> ArrayList<String>( project.getOriginalInterpolatedScriptSourceRoots() ) > >>> ); } > >>> } > >>> > >>> @@ -347,12 +350,12 @@ > >>> > >>> if ( moduleAdjustments == null ) > >>> { > >>> - moduleAdjustments = new HashMap(); > >>> + moduleAdjustments = new HashMap<String, String>(); > >>> > >>> - List modules = getModules(); > >>> + List<String> modules = getModules(); > >>> if ( modules != null ) > >>> { > >>> - for ( Iterator it = modules.iterator(); it.hasNext(); > >>> ) + for ( Iterator<String> it = modules.iterator(); > >>> it.hasNext(); ) > >>> { > >>> String modulePath = (String) it.next(); > >>> String moduleName = modulePath; > >>> @@ -415,12 +418,12 @@ > >>> this.parent = parent; > >>> } > >>> > >>> - public void setRemoteArtifactRepositories( List > >>> remoteArtifactRepositories ) > >>> + public void setRemoteArtifactRepositories( > >>> List<ArtifactRepository> remoteArtifactRepositories ) > >>> { > >>> this.remoteArtifactRepositories = remoteArtifactRepositories; > >>> } > >>> > >>> - public List getRemoteArtifactRepositories() > >>> + public List<ArtifactRepository> getRemoteArtifactRepositories() > >>> { > >>> return remoteArtifactRepositories; > >>> } > >>> @@ -460,12 +463,12 @@ > >>> return basedir; > >>> } > >>> > >>> - public void setDependencies( List dependencies ) > >>> + public void setDependencies( List<Dependency> dependencies ) > >>> { > >>> getModel().setDependencies( dependencies ); > >>> } > >>> > >>> - public List getDependencies() > >>> + public List<Dependency> getDependencies() > >>> { > >>> return getModel().getDependencies(); > >>> } > >>> @@ -524,29 +527,29 @@ > >>> } > >>> } > >>> > >>> - public List getCompileSourceRoots() > >>> + public List<String> getCompileSourceRoots() > >>> { > >>> return compileSourceRoots; > >>> } > >>> > >>> - public List getScriptSourceRoots() > >>> + public List<String> getScriptSourceRoots() > >>> { > >>> return scriptSourceRoots; > >>> } > >>> > >>> - public List getTestCompileSourceRoots() > >>> + public List<String> getTestCompileSourceRoots() > >>> { > >>> return testCompileSourceRoots; > >>> } > >>> > >>> - public List getCompileClasspathElements() > >>> + public List<String> getCompileClasspathElements() > >>> throws DependencyResolutionRequiredException > >>> { > >>> - List list = new ArrayList( getArtifacts().size() ); > >>> + List<String> list = new ArrayList<String>( > >>> getArtifacts().size() ); > >>> > >>> list.add( getBuild().getOutputDirectory() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<?> i = getArtifacts().iterator(); i.hasNext(); > >>> ) { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -563,11 +566,11 @@ > >>> return list; > >>> } > >>> > >>> - public List getCompileArtifacts() > >>> + public List<Artifact> getCompileArtifacts() > >>> { > >>> - List list = new ArrayList( getArtifacts().size() ); > >>> + List<Artifact> list = new ArrayList<Artifact>( > >>> getArtifacts().size() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -585,18 +588,18 @@ > >>> return list; > >>> } > >>> > >>> - public List getCompileDependencies() > >>> + public List<Dependency> getCompileDependencies() > >>> { > >>> - Set artifacts = getArtifacts(); > >>> + Set<Artifact> artifacts = getArtifacts(); > >>> > >>> if ( artifacts == null || artifacts.isEmpty() ) > >>> { > >>> - return Collections.EMPTY_LIST; > >>> + return Collections.<Dependency> emptyList(); > >>> } > >>> > >>> - List list = new ArrayList( artifacts.size() ); > >>> + List<Dependency> list = new ArrayList<Dependency>( > >>> artifacts.size() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -619,16 +622,16 @@ > >>> return list; > >>> } > >>> > >>> - public List getTestClasspathElements() > >>> + public List<String> getTestClasspathElements() > >>> throws DependencyResolutionRequiredException > >>> { > >>> - List list = new ArrayList( getArtifacts().size() + 1 ); > >>> + List<String> list = new ArrayList<String>( > >>> getArtifacts().size() + 1 ); > >>> > >>> list.add( getBuild().getTestOutputDirectory() ); > >>> > >>> list.add( getBuild().getOutputDirectory() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -652,11 +655,11 @@ > >>> return list; > >>> } > >>> > >>> - public List getTestArtifacts() > >>> + public List<Artifact> getTestArtifacts() > >>> { > >>> - List list = new ArrayList( getArtifacts().size() ); > >>> + List<Artifact> list = new ArrayList<Artifact>( > >>> getArtifacts().size() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -678,18 +681,18 @@ > >>> return list; > >>> } > >>> > >>> - public List getTestDependencies() > >>> + public List<Dependency> getTestDependencies() > >>> { > >>> - Set artifacts = getArtifacts(); > >>> + Set<Artifact> artifacts = getArtifacts(); > >>> > >>> if ( artifacts == null || artifacts.isEmpty() ) > >>> { > >>> - return Collections.EMPTY_LIST; > >>> + return Collections.emptyList(); > >>> } > >>> > >>> - List list = new ArrayList( artifacts.size() ); > >>> + List<Dependency> list = new ArrayList<Dependency>( > >>> artifacts.size() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -715,14 +718,14 @@ > >>> return list; > >>> } > >>> > >>> - public List getRuntimeClasspathElements() > >>> + public List<String> getRuntimeClasspathElements() > >>> throws DependencyResolutionRequiredException > >>> { > >>> - List list = new ArrayList( getArtifacts().size() + 1 ); > >>> + List<String> list = new ArrayList<String>( > >>> getArtifacts().size() + 1 ); > >>> > >>> list.add( getBuild().getOutputDirectory() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -743,11 +746,11 @@ > >>> return list; > >>> } > >>> > >>> - public List getRuntimeArtifacts() > >>> + public List<Artifact> getRuntimeArtifacts() > >>> { > >>> - List list = new ArrayList( getArtifacts().size() ); > >>> + List<Artifact> list = new ArrayList<Artifact>( > >>> getArtifacts().size() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -764,18 +767,18 @@ > >>> return list; > >>> } > >>> > >>> - public List getRuntimeDependencies() > >>> + public List<Dependency> getRuntimeDependencies() > >>> { > >>> - Set artifacts = getArtifacts(); > >>> + Set<Artifact> artifacts = getArtifacts(); > >>> > >>> if ( artifacts == null || artifacts.isEmpty() ) > >>> { > >>> - return Collections.EMPTY_LIST; > >>> + return Collections.<Dependency> emptyList(); > >>> } > >>> > >>> - List list = new ArrayList( artifacts.size() ); > >>> + List<Dependency> list = new ArrayList<Dependency>( > >>> artifacts.size() ); > >>> > >>> - for ( Iterator i = artifacts.iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = artifacts.iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -797,14 +800,14 @@ > >>> return list; > >>> } > >>> > >>> - public List getSystemClasspathElements() > >>> + public List<String> getSystemClasspathElements() > >>> throws DependencyResolutionRequiredException > >>> { > >>> - List list = new ArrayList( getArtifacts().size() ); > >>> + List<String> list = new ArrayList<String>( > >>> getArtifacts().size() ); > >>> > >>> list.add( getBuild().getOutputDirectory() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -820,11 +823,11 @@ > >>> return list; > >>> } > >>> > >>> - public List getSystemArtifacts() > >>> + public List<Artifact> getSystemArtifacts() > >>> { > >>> - List list = new ArrayList( getArtifacts().size() ); > >>> + List<Artifact> list = new ArrayList<Artifact>( > >>> getArtifacts().size() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -841,18 +844,18 @@ > >>> return list; > >>> } > >>> > >>> - public List getSystemDependencies() > >>> + public List<Dependency> getSystemDependencies() > >>> { > >>> - Set artifacts = getArtifacts(); > >>> + Set<Artifact> artifacts = getArtifacts(); > >>> > >>> if ( artifacts == null || artifacts.isEmpty() ) > >>> { > >>> - return Collections.EMPTY_LIST; > >>> + return Collections.<Dependency> emptyList(); > >>> } > >>> > >>> - List list = new ArrayList( artifacts.size() ); > >>> + List<Dependency> list = new ArrayList<Dependency>( > >>> artifacts.size() ); > >>> > >>> - for ( Iterator i = getArtifacts().iterator(); i.hasNext(); ) > >>> + for ( Iterator<Artifact> i = getArtifacts().iterator(); > >>> i.hasNext(); ) > >>> { > >>> Artifact a = (Artifact) i.next(); > >>> > >>> @@ -1050,12 +1053,12 @@ > >>> return getModel().getScm(); > >>> } > >>> > >>> - public void setMailingLists( List mailingLists ) > >>> + public void setMailingLists( List<MailingList> mailingLists ) > >>> { > >>> getModel().setMailingLists( mailingLists ); > >>> } > >>> > >>> - public List getMailingLists() > >>> + public List<?> getMailingLists() > >>> { > >>> return getModel().getMailingLists(); > >>> } > >>> @@ -1065,12 +1068,12 @@ > >>> getModel().addMailingList( mailingList ); > >>> } > >>> > >>> - public void setDevelopers( List developers ) > >>> + public void setDevelopers( List<Developer> developers ) > >>> { > >>> getModel().setDevelopers( developers ); > >>> } > >>> > >>> - public List getDevelopers() > >>> + public List<Developer> getDevelopers() > >>> { > >>> return getModel().getDevelopers(); > >>> } > >>> @@ -1080,12 +1083,12 @@ > >>> getModel().addDeveloper( developer ); > >>> } > >>> > >>> - public void setContributors( List contributors ) > >>> + public void setContributors( List<Contributor> contributors ) > >>> { > >>> getModel().setContributors( contributors ); > >>> } > >>> > >>> - public List getContributors() > >>> + public List<Contributor> getContributors() > >>> { > >>> return getModel().getContributors(); > >>> } > >>> @@ -1105,12 +1108,12 @@ > >>> return getModelBuild(); > >>> } > >>> > >>> - public List getResources() > >>> + public List<Resource> getResources() > >>> { > >>> return getBuild().getResources(); > >>> } > >>> > >>> - public List getTestResources() > >>> + public List<Resource> getTestResources() > >>> { > >>> return getBuild().getTestResources(); > >>> } > >>> @@ -1135,12 +1138,12 @@ > >>> return getModel().getReporting(); > >>> } > >>> > >>> - public void setLicenses( List licenses ) > >>> + public void setLicenses( List<License> licenses ) > >>> { > >>> getModel().setLicenses( licenses ); > >>> } > >>> > >>> - public List getLicenses() > >>> + public List<License> getLicenses() > >>> { > >>> return getModel().getLicenses(); > >>> } > >>> @@ -1150,7 +1153,7 @@ > >>> getModel().addLicense( license ); > >>> } > >>> > >>> - public void setArtifacts( Set artifacts ) > >>> + public void setArtifacts( Set<Artifact> artifacts ) > >>> { > >>> this.artifacts = artifacts; > >>> > >>> @@ -1165,12 +1168,12 @@ > >>> * @return {...@link Set} < {...@link Artifact} > > >>> * @see #getDependencyArtifacts() to get only direct dependencies > >>> */ > >>> - public Set getArtifacts() > >>> + public Set<Artifact> getArtifacts() > >>> { > >>> - return artifacts == null ? Collections.EMPTY_SET : artifacts; > >>> + return artifacts == null ? Collections.<Artifact> emptySet() : > >>> artifacts; > >>> } > >>> > >>> - public Map getArtifactMap() > >>> + public Map<String, Artifact> getArtifactMap() > >>> { > >>> if ( artifactMap == null ) > >>> { > >>> @@ -1180,19 +1183,19 @@ > >>> return artifactMap; > >>> } > >>> > >>> - public void setPluginArtifacts( Set pluginArtifacts ) > >>> + public void setPluginArtifacts( Set<Artifact> pluginArtifacts ) > >>> { > >>> this.pluginArtifacts = pluginArtifacts; > >>> > >>> this.pluginArtifactMap = null; > >>> } > >>> > >>> - public Set getPluginArtifacts() > >>> + public Set<Artifact> getPluginArtifacts() > >>> { > >>> return pluginArtifacts; > >>> } > >>> > >>> - public Map getPluginArtifactMap() > >>> + public Map<String, Artifact> getPluginArtifactMap() > >>> { > >>> if ( pluginArtifactMap == null ) > >>> { > >>> @@ -1202,19 +1205,19 @@ > >>> return pluginArtifactMap; > >>> } > >>> > >>> - public void setReportArtifacts( Set reportArtifacts ) > >>> + public void setReportArtifacts( Set<Artifact> reportArtifacts ) > >>> { > >>> this.reportArtifacts = reportArtifacts; > >>> > >>> this.reportArtifactMap = null; > >>> } > >>> > >>> - public Set getReportArtifacts() > >>> + public Set<Artifact> getReportArtifacts() > >>> { > >>> return reportArtifacts; > >>> } > >>> > >>> - public Map getReportArtifactMap() > >>> + public Map<String, Artifact> getReportArtifactMap() > >>> { > >>> if ( reportArtifactMap == null ) > >>> { > >>> @@ -1224,19 +1227,19 @@ > >>> return reportArtifactMap; > >>> } > >>> > >>> - public void setExtensionArtifacts( Set extensionArtifacts ) > >>> + public void setExtensionArtifacts( Set<Artifact> > >>> extensionArtifacts ) > >>> { > >>> this.extensionArtifacts = extensionArtifacts; > >>> > >>> this.extensionArtifactMap = null; > >>> } > >>> > >>> - public Set getExtensionArtifacts() > >>> + public Set<Artifact> getExtensionArtifacts() > >>> { > >>> return this.extensionArtifacts; > >>> } > >>> > >>> - public Map getExtensionArtifactMap() > >>> + public Map<String, Artifact> getExtensionArtifactMap() > >>> { > >>> if ( extensionArtifactMap == null ) > >>> { > >>> @@ -1256,7 +1259,7 @@ > >>> return parentArtifact; > >>> } > >>> > >>> - public List getRepositories() > >>> + public List<Repository> getRepositories() > >>> { > >>> return getModel().getRepositories(); > >>> } > >>> @@ -1265,7 +1268,7 @@ > >>> // Plugins > >>> // > >>> ---------------------------------------------------------------------- > >>> > >>> - public List getReportPlugins() > >>> + public List<ReportPlugin> getReportPlugins() > >>> { > >>> if ( getModel().getReporting() == null ) > >>> { > >>> @@ -1275,7 +1278,7 @@ > >>> > >>> } > >>> > >>> - public List getBuildPlugins() > >>> + public List<Plugin> getBuildPlugins() > >>> { > >>> if ( getModel().getBuild() == null ) > >>> { > >>> @@ -1284,7 +1287,7 @@ > >>> return getModel().getBuild().getPlugins(); > >>> } > >>> > >>> - public List getModules() > >>> + public List<String> getModules() > >>> { > >>> return getModel().getModules(); > >>> } > >>> @@ -1335,7 +1338,7 @@ > >>> > >>> if ( pm != null ) > >>> { > >>> - Map pmByKey = pm.getPluginsAsMap(); > >>> + Map<String, Plugin> pmByKey = pm.getPluginsAsMap(); > >>> > >>> String pluginKey = plugin.getKey(); > >>> > >>> @@ -1348,17 +1351,17 @@ > >>> } > >>> } > >>> > >>> - public List getCollectedProjects() > >>> + public List<MavenProject> getCollectedProjects() > >>> { > >>> return collectedProjects; > >>> } > >>> > >>> - public void setCollectedProjects( List collectedProjects ) > >>> + public void setCollectedProjects( List<MavenProject> > >>> collectedProjects ) > >>> { > >>> this.collectedProjects = collectedProjects; > >>> } > >>> > >>> - public void setPluginArtifactRepositories( List > >>> pluginArtifactRepositories ) > >>> + public void setPluginArtifactRepositories( > >>> List<ArtifactRepository> pluginArtifactRepositories ) > >>> { > >>> this.pluginArtifactRepositories = pluginArtifactRepositories; > >>> } > >>> @@ -1367,7 +1370,7 @@ > >>> * @return a list of ArtifactRepository objects constructed > >>> * from the Repository objects returned by > >>> getPluginRepositories. > >>> */ > >>> - public List getPluginArtifactRepositories() > >>> + public List<ArtifactRepository> getPluginArtifactRepositories() > >>> { > >>> return pluginArtifactRepositories; > >>> } > >>> @@ -1378,17 +1381,17 @@ > >>> > >>> : getReleaseArtifactRepository(); > >>> > >>> } > >>> > >>> - public List getPluginRepositories() > >>> + public List<Repository> getPluginRepositories() > >>> { > >>> return getModel().getPluginRepositories(); > >>> } > >>> > >>> - public void setActiveProfiles( List activeProfiles ) > >>> + public void setActiveProfiles( List<String> activeProfiles ) > >>> { > >>> this.activeProfiles.addAll( activeProfiles ); > >>> } > >>> > >>> - public List getActiveProfiles() > >>> + public List<String> getActiveProfiles() > >>> { > >>> return activeProfiles; > >>> } > >>> @@ -1398,11 +1401,11 @@ > >>> getAttachedArtifacts().add( artifact ); > >>> } > >>> > >>> - public List getAttachedArtifacts() > >>> + public List<Artifact> getAttachedArtifacts() > >>> { > >>> if ( attachedArtifacts == null ) > >>> { > >>> - attachedArtifacts = new ArrayList(); > >>> + attachedArtifacts = new ArrayList<Artifact>(); > >>> } > >>> return attachedArtifacts; > >>> } > >>> @@ -1420,7 +1423,7 @@ > >>> > >>> if ( getBuildPlugins() != null ) > >>> { > >>> - for ( Iterator iterator = getBuildPlugins().iterator(); > >>> iterator.hasNext(); ) > >>> + for ( Iterator<Plugin> iterator = > >>> getBuildPlugins().iterator(); iterator.hasNext(); ) > >>> { > >>> Plugin plugin = (Plugin) iterator.next(); > >>> > >>> @@ -1498,7 +1501,7 @@ > >>> > >>> if ( getReportPlugins() != null ) > >>> { > >>> - for ( Iterator iterator = getReportPlugins().iterator(); > >>> iterator.hasNext(); ) > >>> + for ( Iterator<ReportPlugin> iterator = > >>> getReportPlugins().iterator(); iterator.hasNext(); ) > >>> { > >>> ReportPlugin plugin = (ReportPlugin) iterator.next(); > >>> > >>> @@ -1564,12 +1567,12 @@ > >>> * @return {...@link Set} < {...@link Artifact} > > >>> * @see #getArtifacts() to get all transitive dependencies > >>> */ > >>> - public Set getDependencyArtifacts() > >>> + public Set<Artifact> getDependencyArtifacts() > >>> { > >>> return dependencyArtifacts; > >>> } > >>> > >>> - public void setDependencyArtifacts( Set dependencyArtifacts ) > >>> + public void setDependencyArtifacts( Set<Artifact> > >>> dependencyArtifacts ) > >>> { > >>> this.dependencyArtifacts = dependencyArtifacts; > >>> } > >>> @@ -1594,12 +1597,12 @@ > >>> return originalModel; > >>> } > >>> > >>> - public void setManagedVersionMap( Map map ) > >>> + public void setManagedVersionMap( Map<String, ArtifactVersion> map > >>> ) { > >>> this.managedVersionMap = map; > >>> } > >>> > >>> - public Map getManagedVersionMap() > >>> + public Map<String, ArtifactVersion> getManagedVersionMap() > >>> { > >>> return this.managedVersionMap; > >>> } > >>> @@ -1627,12 +1630,12 @@ > >>> return getId().hashCode(); > >>> } > >>> > >>> - public List getBuildExtensions() > >>> + public List<Extension> getBuildExtensions() > >>> { > >>> Build build = getBuild(); > >>> if ( build == null || build.getExtensions() == null ) > >>> { > >>> - return Collections.EMPTY_LIST; > >>> + return Collections.<Extension> emptyList(); > >>> } > >>> else > >>> { > >>> @@ -1644,7 +1647,7 @@ > >>> * @todo the lazy initialisation of this makes me uneasy. > >>> * @return {...@link Set} < {...@link Artifact} > > >>> */ > >>> - public Set createArtifacts( ArtifactFactory artifactFactory, > >>> String inheritedScope, > >>> + public Set<Artifact> createArtifacts( ArtifactFactory > >>> artifactFactory, String inheritedScope, > >>> ArtifactFilter dependencyFilter ) > >>> throws InvalidDependencyVersionException > >>> { > >>> @@ -1674,12 +1677,12 @@ > >>> return getModel().getProperties(); > >>> } > >>> > >>> - public List getFilters() > >>> + public List<String> getFilters() > >>> { > >>> return getBuild().getFilters(); > >>> } > >>> > >>> - public Map getProjectReferences() > >>> + public Map<String, MavenProject> getProjectReferences() > >>> { > >>> return projectReferences; > >>> } > >>> @@ -1705,22 +1708,22 @@ > >>> this.model = model; > >>> } > >>> > >>> - protected void setAttachedArtifacts( List attachedArtifacts ) > >>> + protected void setAttachedArtifacts( List<Artifact> > >>> attachedArtifacts ) > >>> { > >>> this.attachedArtifacts = attachedArtifacts; > >>> } > >>> > >>> - protected void setCompileSourceRoots( List compileSourceRoots ) > >>> + protected void setCompileSourceRoots( List<String> > >>> compileSourceRoots ) > >>> { > >>> this.compileSourceRoots = compileSourceRoots; > >>> } > >>> > >>> - protected void setTestCompileSourceRoots( List > >>> testCompileSourceRoots ) > >>> + protected void setTestCompileSourceRoots( List<String> > >>> testCompileSourceRoots ) > >>> { > >>> this.testCompileSourceRoots = testCompileSourceRoots; > >>> } > >>> > >>> - protected void setScriptSourceRoots( List scriptSourceRoots ) > >>> + protected void setScriptSourceRoots( List<String> > >>> scriptSourceRoots ) > >>> { > >>> this.scriptSourceRoots = scriptSourceRoots; > >>> } > >>> @@ -1737,16 +1740,16 @@ > >>> > >>> public void resolveActiveArtifacts() > >>> { > >>> - Set depArtifacts = getDependencyArtifacts(); > >>> + Set<Artifact> depArtifacts = getDependencyArtifacts(); > >>> if ( depArtifacts == null ) > >>> { > >>> return; > >>> } > >>> > >>> - Set updated = new LinkedHashSet( depArtifacts.size() ); > >>> + Set<Artifact> updated = new LinkedHashSet<Artifact>( > >>> depArtifacts.size() ); > >>> int updatedCount = 0; > >>> > >>> - for ( Iterator it = depArtifacts.iterator(); it.hasNext(); ) > >>> + for ( Iterator<Artifact> it = depArtifacts.iterator(); > >>> it.hasNext(); ) > >>> { > >>> Artifact depArtifact = (Artifact) it.next(); > >>> Artifact replaced = replaceWithActiveArtifact( depArtifact > >>> ); @@ -1815,13 +1818,13 @@ > >>> * @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 artifacts, Artifact > >>> requestedArtifact ) > >>> + private Artifact findMatchingArtifact( List<Artifact> artifacts, > >>> Artifact requestedArtifact ) > >>> { > >>> if ( artifacts != null && !artifacts.isEmpty() ) > >>> { > >>> // first try matching by dependency conflict id > >>> String requestedId = > >>> requestedArtifact.getDependencyConflictId(); > >>> - for ( Iterator it = artifacts.iterator(); it.hasNext(); ) > >>> + for ( Iterator<Artifact> it = artifacts.iterator(); > >>> it.hasNext(); ) > >>> { > >>> Artifact artifact = (Artifact) it.next(); > >>> if ( requestedId.equals( > >>> artifact.getDependencyConflictId() ) ) > >>> @@ -1832,7 +1835,7 @@ > >>> > >>> // next try matching by repository conflict id > >>> requestedId = getRepositoryConflictId( requestedArtifact ); > >>> - for ( Iterator it = artifacts.iterator(); it.hasNext(); ) > >>> + for ( Iterator<Artifact> it = artifacts.iterator(); > >>> it.hasNext(); ) > >>> { > >>> Artifact artifact = (Artifact) it.next(); > >>> if ( requestedId.equals( getRepositoryConflictId( > >>> artifact ) ) ) > >>> @@ -1898,7 +1901,7 @@ > >>> } > >>> } > >>> > >>> - private void addArtifactPath(Artifact a, List list) throws > >>> DependencyResolutionRequiredException > >>> + private void addArtifactPath(Artifact a, List<String> list) throws > >>> DependencyResolutionRequiredException > >>> { > >>> File file = a.getFile(); > >>> if ( file == null ) > >>> @@ -1954,21 +1957,21 @@ > >>> > >>> private Build originalInterpolatedBuild; > >>> > >>> - private List dynamicCompileSourceRoots; > >>> + private List<String> dynamicCompileSourceRoots; > >>> > >>> - private List originalInterpolatedCompileSourceRoots; > >>> + private List<String> originalInterpolatedCompileSourceRoots; > >>> > >>> - private List dynamicTestCompileSourceRoots; > >>> + private List<String> dynamicTestCompileSourceRoots; > >>> > >>> - private List originalInterpolatedTestCompileSourceRoots; > >>> + private List<String> originalInterpolatedTestCompileSourceRoots; > >>> > >>> - private List dynamicScriptSourceRoots; > >>> + private List<String> dynamicScriptSourceRoots; > >>> > >>> - private List originalInterpolatedScriptSourceRoots; > >>> + private List<String> originalInterpolatedScriptSourceRoots; > >>> > >>> private boolean isConcrete = false; > >>> > >>> - public boolean isConcrete() > >>> + public boolean isConcrete() > >>> { > >>> return isConcrete; > >>> } > >>> @@ -1988,32 +1991,32 @@ > >>> return originalInterpolatedBuild; > >>> } > >>> > >>> - public List getDynamicCompileSourceRoots() > >>> + public List<String> getDynamicCompileSourceRoots() > >>> { > >>> return dynamicCompileSourceRoots; > >>> } > >>> > >>> - public List getOriginalInterpolatedCompileSourceRoots() > >>> + public List<String> getOriginalInterpolatedCompileSourceRoots() > >>> { > >>> return originalInterpolatedCompileSourceRoots; > >>> } > >>> > >>> - public List getDynamicTestCompileSourceRoots() > >>> + public List<String> getDynamicTestCompileSourceRoots() > >>> { > >>> return dynamicTestCompileSourceRoots; > >>> } > >>> > >>> - public List getOriginalInterpolatedTestCompileSourceRoots() > >>> + public List<String> > >>> getOriginalInterpolatedTestCompileSourceRoots() { > >>> return originalInterpolatedTestCompileSourceRoots; > >>> } > >>> > >>> - public List getDynamicScriptSourceRoots() > >>> + public List<String> getDynamicScriptSourceRoots() > >>> { > >>> return dynamicScriptSourceRoots; > >>> } > >>> > >>> - public List getOriginalInterpolatedScriptSourceRoots() > >>> + public List<String> getOriginalInterpolatedScriptSourceRoots() > >>> { > >>> return originalInterpolatedScriptSourceRoots; > >>> } > >>> @@ -2034,19 +2037,19 @@ > >>> originalInterpolatedBuild = null; > >>> } > >>> > >>> - public void preserveCompileSourceRoots( List > >>> originalInterpolatedCompileSourceRoots ) > >>> + public void preserveCompileSourceRoots( List<String> > >>> originalInterpolatedCompileSourceRoots ) > >>> { > >>> dynamicCompileSourceRoots = getCompileSourceRoots(); > >>> this.originalInterpolatedCompileSourceRoots = > >>> originalInterpolatedCompileSourceRoots; > >>> } > >>> > >>> - public void preserveTestCompileSourceRoots( List > >>> originalInterpolatedTestCompileSourceRoots ) > >>> + public void preserveTestCompileSourceRoots( List<String> > >>> originalInterpolatedTestCompileSourceRoots ) > >>> { > >>> dynamicTestCompileSourceRoots = getTestCompileSourceRoots(); > >>> this.originalInterpolatedTestCompileSourceRoots = > >>> originalInterpolatedTestCompileSourceRoots; > >>> } > >>> > >>> - public void preserveScriptSourceRoots( List > >>> originalInterpolatedScriptSourceRoots ) > >>> + public void preserveScriptSourceRoots( List<String> > >>> originalInterpolatedScriptSourceRoots ) > >>> { > >>> dynamicScriptSourceRoots = getScriptSourceRoots(); > >>> this.originalInterpolatedScriptSourceRoots = > >>> originalInterpolatedScriptSourceRoots; > >>> @@ -2071,32 +2074,32 @@ > >>> this.originalInterpolatedBuild = originalInterpolatedBuild; > >>> } > >>> > >>> - protected void setDynamicCompileSourceRoots( List > >>> dynamicCompileSourceRoots ) > >>> + protected void setDynamicCompileSourceRoots( List<String> > >>> dynamicCompileSourceRoots ) > >>> { > >>> this.dynamicCompileSourceRoots = dynamicCompileSourceRoots; > >>> } > >>> > >>> - protected void setOriginalInterpolatedCompileSourceRoots( List > >>> originalInterpolatedCompileSourceRoots ) > >>> + protected void setOriginalInterpolatedCompileSourceRoots( > >>> List<String> originalInterpolatedCompileSourceRoots ) > >>> { > >>> this.originalInterpolatedCompileSourceRoots = > >>> originalInterpolatedCompileSourceRoots; > >>> } > >>> > >>> - protected void setDynamicTestCompileSourceRoots( List > >>> dynamicTestCompileSourceRoots ) > >>> + protected void setDynamicTestCompileSourceRoots( List<String> > >>> dynamicTestCompileSourceRoots ) > >>> { > >>> this.dynamicTestCompileSourceRoots = > >>> dynamicTestCompileSourceRoots; > >>> } > >>> > >>> - protected void setOriginalInterpolatedTestCompileSourceRoots( List > >>> originalInterpolatedTestCompileSourceRoots ) > >>> + protected void setOriginalInterpolatedTestCompileSourceRoots( > >>> List<String> originalInterpolatedTestCompileSourceRoots ) > >>> { > >>> this.originalInterpolatedTestCompileSourceRoots = > >>> originalInterpolatedTestCompileSourceRoots; > >>> } > >>> > >>> - protected void setDynamicScriptSourceRoots( List > >>> dynamicScriptSourceRoots ) > >>> + protected void setDynamicScriptSourceRoots( List<String> > >>> dynamicScriptSourceRoots ) > >>> { > >>> this.dynamicScriptSourceRoots = dynamicScriptSourceRoots; > >>> } > >>> > >>> - protected void setOriginalInterpolatedScriptSourceRoots( List > >>> originalInterpolatedScriptSourceRoots ) > >>> + protected void setOriginalInterpolatedScriptSourceRoots( > >>> List<String> originalInterpolatedScriptSourceRoots ) > >>> { > >>> this.originalInterpolatedScriptSourceRoots = > >>> originalInterpolatedScriptSourceRoots; > >>> } > >>> @@ -2114,7 +2117,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 > >>> ) ); > >>> > >>> Modified: > >>> maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml > >>> URL: > >>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/mave > >>>n-repository-metadata/pom.xml?rev=770570&r1=770569&r2=770570&view=diff > >>> ======================================================================= > >>>======= > >>> > >>> --- > >>> maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml > >>> (original) > >>> +++ > >>> maven/components/branches/maven-2.2.x/maven-repository-metadata/pom.xml > >>> Fri May 1 08:04:48 2009 > >>> @@ -47,6 +47,7 @@ > >>> <models> > >>> <model>src/main/mdo/metadata.mdo</model> > >>> </models> > >>> + <useJava5>true</useJava5> > >>> </configuration> > >>> </plugin> > >>> </plugins> > >>> > >>> Modified: maven/components/branches/maven-2.2.x/maven-settings/pom.xml > >>> URL: > >>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/mave > >>>n-settings/pom.xml?rev=770570&r1=770569&r2=770570&view=diff > >>> ======================================================================= > >>>======= > >>> > >>> --- maven/components/branches/maven-2.2.x/maven-settings/pom.xml > >>> (original) > >>> +++ maven/components/branches/maven-2.2.x/maven-settings/pom.xml Fri > >>> May 1 08:04:48 2009 > >>> @@ -58,6 +58,7 @@ > >>> <models> > >>> <model>src/main/mdo/settings.mdo</model> > >>> </models> > >>> + <useJava5>true</useJava5> > >>> </configuration> > >>> </plugin> > >>> </plugins> > >>> > >>> Modified: maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml > >>> URL: > >>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/mave > >>>n-toolchain/pom.xml?rev=770570&r1=770569&r2=770570&view=diff > >>> ======================================================================= > >>>======= > >>> > >>> --- maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml > >>> (original) > >>> +++ maven/components/branches/maven-2.2.x/maven-toolchain/pom.xml Fri > >>> May 1 08:04:48 2009 > >>> @@ -66,6 +66,7 @@ > >>> <models> > >>> <model>src/main/mdo/toolchains.mdo</model> > >>> </models> > >>> + <useJava5>true</useJava5> > >>> </configuration> > >>> </plugin> > >>> <plugin> > >> > >> Thanks, > >> > >> Jason > >> > >> ---------------------------------------------------------- > >> Jason van Zyl > >> Founder, Apache Maven > >> http://twitter.com/jvanzyl > >> http://twitter.com/SonatypeNexus > >> http://twitter.com/SonatypeM2E > >> ---------------------------------------------------------- > >> > >> We all have problems. How we deal with them is a measure of our worth. > >> > >> -- Unknown > >> > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: [email protected] > >> For additional commands, e-mail: [email protected] > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: [email protected] > > For additional commands, e-mail: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
