You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2013/06/14 10:31:42 UTC
[01/14] git commit: Fix misprint
Updated Branches:
refs/heads/slf4j-log4j2 f0eb05aef -> bce345ea4 (forced update)
Fix misprint
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/143216f9
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/143216f9
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/143216f9
Branch: refs/heads/slf4j-log4j2
Commit: 143216f93a8b6be55c3d2882aeda3c1e8db53edc
Parents: 4e24edb
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 20:53:31 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 20:53:31 2013 +0200
----------------------------------------------------------------------
maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/143216f9/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index bae09b8..2d7f9a9 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -366,7 +366,7 @@ public class DefaultMaven
if ( request.isUseLegacyLocalRepository() )
{
- logger.warn( "Disabling enhanced local repository: using legacy is stronlgy discouraged to ensure build reproducibility." );
+ logger.warn( "Disabling enhanced local repository: using legacy is strongly discouraged to ensure build reproducibility." );
try
{
session.setLocalRepositoryManager( simpleLocalRepositoryManagerFactory.newInstance( session, localRepo ) );
[09/14] git commit: Code cleanup - Maven requires Java 5+ : Replace
for and while loops by for each
Posted by ah...@apache.org.
Code cleanup - Maven requires Java 5+ : Replace for and while loops by for each
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d92746dc
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d92746dc
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d92746dc
Branch: refs/heads/slf4j-log4j2
Commit: d92746dc25bdce073571cf6fd8f78d6573fe75f0
Parents: 1f84f8f
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 22:21:54 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 22:21:54 2013 +0200
----------------------------------------------------------------------
.../maven/profiles/DefaultProfileManager.java | 12 ++---
.../maven/profiles/ProfilesConversionUtils.java | 12 ++---
.../DefaultModelInheritanceAssembler.java | 13 ++---
.../StringSearchModelInterpolator.java | 50 +++++++++++---------
.../project/path/DefaultPathTranslator.java | 4 +-
.../usability/plugin/ExpressionDocumenter.java | 18 +++----
.../maven/artifact/testutils/MockManager.java | 12 ++---
.../apache/maven/project/ModelUtilsTest.java | 4 +-
.../maven/project/ProjectClasspathTest.java | 3 +-
.../inheritance/t04/ProjectInheritanceTest.java | 12 +++--
.../inheritance/t05/ProjectInheritanceTest.java | 13 ++---
.../inheritance/t07/ProjectInheritanceTest.java | 15 +++---
.../resolver/DefaultArtifactCollectorTest.java | 12 ++---
.../apache/maven/execution/ReactorManager.java | 8 ++--
.../DefaultLifecycleBindingsInjector.java | 9 ++--
.../org/apache/maven/project/MavenProject.java | 18 +++----
.../java/DefaultJavaToolchainFactory.java | 15 +++---
.../project/DefaultMavenProjectBuilderTest.java | 4 +-
.../java/org/apache/maven/cli/CLIManager.java | 4 +-
.../java/org/apache/maven/cli/MavenCli.java | 12 ++---
20 files changed, 120 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
index 740c2cd..bfade80 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
@@ -141,9 +141,9 @@ public class DefaultProfileManager
*/
public void explicitlyActivate( List profileIds )
{
- for ( Iterator it = profileIds.iterator(); it.hasNext(); )
+ for ( Object profileId1 : profileIds )
{
- String profileId = (String) it.next();
+ String profileId = (String) profileId1;
explicitlyActivate( profileId );
}
@@ -167,9 +167,9 @@ public class DefaultProfileManager
*/
public void explicitlyDeactivate( List profileIds )
{
- for ( Iterator it = profileIds.iterator(); it.hasNext(); )
+ for ( Object profileId1 : profileIds )
{
- String profileId = (String) it.next();
+ String profileId = (String) profileId1;
explicitlyDeactivate( profileId );
}
@@ -215,9 +215,9 @@ public class DefaultProfileManager
*/
public void addProfiles( List profiles )
{
- for ( Iterator it = profiles.iterator(); it.hasNext(); )
+ for ( Object profile1 : profiles )
{
- Profile profile = (Profile) it.next();
+ Profile profile = (Profile) profile1;
addProfile( profile );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
index 8abe1de..041a9bb 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java
@@ -100,21 +100,19 @@ public class ProfilesConversionUtils
List repos = profileXmlProfile.getRepositories();
if ( repos != null )
{
- for ( Iterator it = repos.iterator(); it.hasNext(); )
+ for ( Object repo : repos )
{
- profile
- .addRepository(
- convertFromProfileXmlRepository( (org.apache.maven.profiles.Repository) it.next() ) );
+ profile.addRepository( convertFromProfileXmlRepository( (org.apache.maven.profiles.Repository) repo ) );
}
}
List pluginRepos = profileXmlProfile.getPluginRepositories();
if ( pluginRepos != null )
{
- for ( Iterator it = pluginRepos.iterator(); it.hasNext(); )
+ for ( Object pluginRepo : pluginRepos )
{
- profile.addPluginRepository( convertFromProfileXmlRepository( (org.apache.maven.profiles.Repository) it
- .next() ) );
+ profile.addPluginRepository(
+ convertFromProfileXmlRepository( (org.apache.maven.profiles.Repository) pluginRepo ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
index 85f7526..ec04f34 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
@@ -323,15 +323,13 @@ public class DefaultModelInheritanceAssembler
List<Dependency> childDeps = childDepMgmt.getDependencies();
Map<String, Dependency> mappedChildDeps = new TreeMap<String, Dependency>();
- for ( Iterator<Dependency> it = childDeps.iterator(); it.hasNext(); )
+ for ( Dependency dep : childDeps )
{
- Dependency dep = it.next();
mappedChildDeps.put( dep.getManagementKey(), dep );
}
- for ( Iterator<Dependency> it = parentDepMgmt.getDependencies().iterator(); it.hasNext(); )
+ for ( Dependency dep : parentDepMgmt.getDependencies() )
{
- Dependency dep = it.next();
if ( !mappedChildDeps.containsKey( dep.getManagementKey() ) )
{
childDepMgmt.addDependency( dep );
@@ -382,14 +380,13 @@ public class DefaultModelInheritanceAssembler
Map childPlugins = child.getReportPluginsAsMap();
- for ( Iterator it = parentPlugins.iterator(); it.hasNext(); )
+ for ( Object parentPlugin1 : parentPlugins )
{
- ReportPlugin parentPlugin = (ReportPlugin) it.next();
+ ReportPlugin parentPlugin = (ReportPlugin) parentPlugin1;
String parentInherited = parentPlugin.getInherited();
- if ( !handleAsInheritance || ( parentInherited == null )
- || Boolean.valueOf( parentInherited ) )
+ if ( !handleAsInheritance || ( parentInherited == null ) || Boolean.valueOf( parentInherited ) )
{
ReportPlugin assembledPlugin = parentPlugin;
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index 1ef5579..dcb8e2b 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -168,33 +168,35 @@ public class StringSearchModelInterpolator
fieldsByClass.put( cls, fields );
}
- for ( int i = 0; i < fields.length; i++ )
+ for ( Field field : fields )
{
- Class<?> type = fields[i].getType();
- if ( isQualifiedForInterpolation( fields[i], type ) )
+ Class<?> type = field.getType();
+ if ( isQualifiedForInterpolation( field, type ) )
{
- boolean isAccessible = fields[i].isAccessible();
- fields[i].setAccessible( true );
+ boolean isAccessible = field.isAccessible();
+ field.setAccessible( true );
try
{
try
{
if ( String.class == type )
{
- String value = (String) fields[i].get( target );
+ String value = (String) field.get( target );
if ( value != null )
{
- String interpolated = modelInterpolator.interpolateInternal( value, valueSources, postProcessors, debugEnabled );
+ String interpolated =
+ modelInterpolator.interpolateInternal( value, valueSources, postProcessors,
+ debugEnabled );
if ( !interpolated.equals( value ) )
{
- fields[i].set( target, interpolated );
+ field.set( target, interpolated );
}
}
}
else if ( Collection.class.isAssignableFrom( type ) )
{
- Collection<Object> c = (Collection<Object>) fields[i].get( target );
+ Collection<Object> c = (Collection<Object>) field.get( target );
if ( c != null && !c.isEmpty() )
{
List<Object> originalValues = new ArrayList<Object>( c );
@@ -206,8 +208,9 @@ public class StringSearchModelInterpolator
{
if ( debugEnabled && logger != null )
{
- logger.debug( "Skipping interpolation of field: " + fields[i] + " in: "
- + cls.getName() + "; it is an unmodifiable collection." );
+ logger.debug( "Skipping interpolation of field: " + field + " in: "
+ + cls.getName()
+ + "; it is an unmodifiable collection." );
}
continue;
}
@@ -256,7 +259,7 @@ public class StringSearchModelInterpolator
}
else if ( Map.class.isAssignableFrom( type ) )
{
- Map<Object, Object> m = (Map<Object, Object>) fields[i].get( target );
+ Map<Object, Object> m = (Map<Object, Object>) field.get( target );
if ( m != null && !m.isEmpty() )
{
for ( Map.Entry<Object, Object> entry : m.entrySet() )
@@ -283,10 +286,11 @@ public class StringSearchModelInterpolator
{
if ( debugEnabled && logger != null )
{
- logger.debug( "Skipping interpolation of field: "
- + fields[i] + " (key: " + entry.getKey() + ") in: "
- + cls.getName()
- + "; it is an unmodifiable collection." );
+ logger.debug(
+ "Skipping interpolation of field: " + field
+ + " (key: " + entry.getKey() + ") in: "
+ + cls.getName()
+ + "; it is an unmodifiable collection." );
}
}
}
@@ -308,10 +312,10 @@ public class StringSearchModelInterpolator
}
else
{
- Object value = fields[i].get( target );
+ Object value = field.get( target );
if ( value != null )
{
- if ( fields[i].getType().isArray() )
+ if ( field.getType().isArray() )
{
evaluateArray( value );
}
@@ -324,18 +328,18 @@ public class StringSearchModelInterpolator
}
catch ( IllegalArgumentException e )
{
- throw new ModelInterpolationException( "Failed to interpolate field: " + fields[i]
- + " on class: " + cls.getName(), e );
+ throw new ModelInterpolationException(
+ "Failed to interpolate field: " + field + " on class: " + cls.getName(), e );
}
catch ( IllegalAccessException e )
{
- throw new ModelInterpolationException( "Failed to interpolate field: " + fields[i]
- + " on class: " + cls.getName(), e );
+ throw new ModelInterpolationException(
+ "Failed to interpolate field: " + field + " on class: " + cls.getName(), e );
}
}
finally
{
- fields[i].setAccessible( isAccessible );
+ field.setAccessible( isAccessible );
}
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
index 020b652..ece7c39 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
@@ -125,9 +125,9 @@ public class DefaultPathTranslator
if ( s != null )
{
String basedirExpr = null;
- for ( int i = 0; i < BASEDIR_EXPRESSIONS.length; i++ )
+ for ( String BASEDIR_EXPRESSION : BASEDIR_EXPRESSIONS )
{
- basedirExpr = BASEDIR_EXPRESSIONS[i];
+ basedirExpr = BASEDIR_EXPRESSION;
if ( s.startsWith( basedirExpr ) )
{
break;
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
index e0192ca..9a4569f 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
@@ -55,13 +55,13 @@ public class ExpressionDocumenter
ClassLoader docLoader = initializeDocLoader();
- for ( int i = 0; i < EXPRESSION_ROOTS.length; i++ )
+ for ( String EXPRESSION_ROOT : EXPRESSION_ROOTS )
{
InputStream docStream = null;
try
{
- docStream = docLoader
- .getResourceAsStream( EXPRESSION_DOCO_ROOTPATH + EXPRESSION_ROOTS[i] + ".paramdoc.xml" );
+ docStream =
+ docLoader.getResourceAsStream( EXPRESSION_DOCO_ROOTPATH + EXPRESSION_ROOT + ".paramdoc.xml" );
if ( docStream != null )
{
@@ -72,13 +72,13 @@ public class ExpressionDocumenter
}
catch ( IOException e )
{
- throw new ExpressionDocumentationException( "Failed to read documentation for expression root: "
- + EXPRESSION_ROOTS[i], e );
+ throw new ExpressionDocumentationException(
+ "Failed to read documentation for expression root: " + EXPRESSION_ROOT, e );
}
catch ( XmlPullParserException e )
{
- throw new ExpressionDocumentationException( "Failed to parse documentation for expression root: "
- + EXPRESSION_ROOTS[i], e );
+ throw new ExpressionDocumentationException(
+ "Failed to parse documentation for expression root: " + EXPRESSION_ROOT, e );
}
finally
{
@@ -130,9 +130,9 @@ public class ExpressionDocumenter
if ( expressions != null && !expressions.isEmpty() )
{
- for ( Iterator it = expressions.iterator(); it.hasNext(); )
+ for ( Object expression : expressions )
{
- Expression expr = (Expression) it.next();
+ Expression expr = (Expression) expression;
bySyntax.put( expr.getSyntax(), expr );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
index 342af15..4b6f637 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
@@ -37,20 +37,20 @@ public class MockManager
public void replayAll()
{
- for ( Iterator it = mockControls.iterator(); it.hasNext(); )
+ for ( Object mockControl : mockControls )
{
- MockControl control = ( MockControl ) it.next();
-
+ MockControl control = (MockControl) mockControl;
+
control.replay();
}
}
public void verifyAll()
{
- for ( Iterator it = mockControls.iterator(); it.hasNext(); )
+ for ( Object mockControl : mockControls )
{
- MockControl control = ( MockControl ) it.next();
-
+ MockControl control = (MockControl) mockControl;
+
control.verify();
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
index d2c44a1..06b2e1d 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
@@ -157,9 +157,9 @@ public class ModelUtilsTest
if( configuration != null )
{
- for ( Iterator it = configuration.entrySet().iterator(); it.hasNext(); )
+ for ( Object o : configuration.entrySet() )
{
- Map.Entry entry = (Map.Entry) it.next();
+ Map.Entry entry = (Map.Entry) o;
Xpp3Dom param = new Xpp3Dom( String.valueOf( entry.getKey() ) );
param.setValue( String.valueOf( entry.getValue() ) );
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
index 01a128b..f696675 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ProjectClasspathTest.java
@@ -133,9 +133,8 @@ public class ProjectClasspathTest
private Artifact getArtifact( MavenProject project, String groupId, String artifactId )
{
System.out.println( "[ Looking for " + groupId + ":" + artifactId + " ]" );
- for ( Iterator<Artifact> i = project.getArtifacts().iterator(); i.hasNext(); )
+ for ( Artifact a : project.getArtifacts() )
{
- Artifact a = i.next();
System.out.println( a.toString() );
if ( artifactId.equals( a.getArtifactId() ) && a.getGroupId().equals( groupId ) )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
index bb103cc..e24262f 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t04/ProjectInheritanceTest.java
@@ -70,12 +70,14 @@ public class ProjectInheritanceTest
assertTrue( "No Artifacts", set.size() > 0 );
assertTrue( "Set size should be 3, is " + set.size(), set.size() == 3 );
- Iterator iter = set.iterator();
- while ( iter.hasNext() )
+ for ( Object aSet : set )
{
- Artifact artifact = (Artifact) iter.next();
- System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion()
- + " Optional=" + ( artifact.isOptional() ? "true" : "false" ) );
+ Artifact artifact = (Artifact) aSet;
+ System.out.println(
+ "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Optional=" + (
+ artifact.isOptional()
+ ? "true"
+ : "false" ) );
assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
artifact.getVersion().equals( "1.0" ) );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
index 6007b64..1d2bd18 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t05/ProjectInheritanceTest.java
@@ -64,14 +64,15 @@ public class ProjectInheritanceTest
Set set = project1.getArtifacts();
assertNotNull( "No artifacts", set );
assertTrue( "No Artifacts", set.size() > 0 );
- Iterator iter = set.iterator();
- while ( iter.hasNext() )
+ for ( Object aSet : set )
{
- Artifact artifact = (Artifact) iter.next();
- System.out.println( "Artifact: " + artifact.getDependencyConflictId() + " "
- + artifact.getVersion() + " Scope: " + artifact.getScope() );
- assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals( "1.0" ) );
+ Artifact artifact = (Artifact) aSet;
+ System.out.println(
+ "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Scope: "
+ + artifact.getScope() );
+ assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
+ artifact.getVersion().equals( "1.0" ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
index 9512ee7..68586aa 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
@@ -66,14 +66,17 @@ public class ProjectInheritanceTest
assertTrue("No Artifacts", set.size() > 0);
assertTrue("Set size should be 3, is " + set.size(), set.size() == 3 );
- Iterator iter = set.iterator();
-
- while (iter.hasNext())
+ for ( Object aSet : set )
{
- Artifact artifact = (Artifact)iter.next();
+ Artifact artifact = (Artifact) aSet;
assertFalse( "", artifact.getArtifactId().equals( "t07-d" ) );
- System.out.println("Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Optional=" + (artifact.isOptional() ? "true" : "false"));
- assertTrue("Incorrect version for " + artifact.getDependencyConflictId(), artifact.getVersion().equals("1.0"));
+ System.out.println(
+ "Artifact: " + artifact.getDependencyConflictId() + " " + artifact.getVersion() + " Optional=" + (
+ artifact.isOptional()
+ ? "true"
+ : "false" ) );
+ assertTrue( "Incorrect version for " + artifact.getDependencyConflictId(),
+ artifact.getVersion().equals( "1.0" ) );
}
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index 7c48507..f8fe1a3 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -719,9 +719,9 @@ public class DefaultArtifactCollectorTest
private Artifact getArtifact( String id, Set artifacts )
{
- for ( Iterator i = artifacts.iterator(); i.hasNext(); )
+ for ( Object artifact : artifacts )
{
- Artifact a = (Artifact) i.next();
+ Artifact a = (Artifact) artifact;
if ( a.getArtifactId().equals( id ) && a.getGroupId().equals( GROUP_ID ) )
{
return a;
@@ -886,9 +886,9 @@ public class DefaultArtifactCollectorTest
{
Set projectArtifacts = new HashSet();
- for ( Iterator i = dependencies.iterator(); i.hasNext(); )
+ for ( Object dependency : dependencies )
{
- Artifact d = (Artifact) i.next();
+ Artifact d = (Artifact) dependency;
VersionRange versionRange;
if ( d.getVersionRange() != null )
@@ -904,8 +904,8 @@ public class DefaultArtifactCollectorTest
{
/* don't call createDependencyArtifact as it'll ignore test and provided scopes */
artifact =
- artifactFactory.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(),
- d.getScope(), d.getType() );
+ artifactFactory.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getScope(),
+ d.getType() );
}
else
{
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
index 6cbc133..97d5857 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
@@ -127,12 +127,12 @@ public class ReactorManager
if ( dependents != null && !dependents.isEmpty() )
{
- for ( Iterator it = dependents.iterator(); it.hasNext(); )
+ for ( Object dependent : dependents )
{
- String dependentId = (String) it.next();
+ String dependentId = (String) dependent;
- if ( !buildSuccessesByProject.containsKey( dependentId )
- && !buildFailuresByProject.containsKey( dependentId ) )
+ if ( !buildSuccessesByProject.containsKey( dependentId ) && !buildFailuresByProject.containsKey(
+ dependentId ) )
{
blackList( dependentId );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
index 46aeb0b..c3b3753 100644
--- a/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
+++ b/maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
@@ -110,18 +110,16 @@ public class DefaultLifecycleBindingsInjector
Map<Object, Plugin> merged = new LinkedHashMap<Object, Plugin>( ( src.size() + tgt.size() ) * 2 );
- for ( Iterator<Plugin> it = tgt.iterator(); it.hasNext(); )
+ for ( Plugin element : tgt )
{
- Plugin element = it.next();
Object key = getPluginKey( element );
merged.put( key, element );
}
Map<Object, Plugin> unmanaged = new LinkedHashMap<Object, Plugin>();
- for ( Iterator<Plugin> it = src.iterator(); it.hasNext(); )
+ for ( Plugin element : src )
{
- Plugin element = it.next();
Object key = getPluginKey( element );
Plugin existing = merged.get( key );
if ( existing != null )
@@ -140,9 +138,8 @@ public class DefaultLifecycleBindingsInjector
PluginManagement pluginMgmt = (PluginManagement) context.get( PLUGIN_MANAGEMENT );
if ( pluginMgmt != null )
{
- for ( Iterator<Plugin> it = pluginMgmt.getPlugins().iterator(); it.hasNext(); )
+ for ( Plugin managedPlugin : pluginMgmt.getPlugins() )
{
- Plugin managedPlugin = it.next();
Object key = getPluginKey( managedPlugin );
Plugin unmanagedPlugin = unmanaged.get( key );
if ( unmanagedPlugin != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index c3f214f..d6f308f 100644
--- a/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -291,9 +291,8 @@ public class MavenProject
List<String> modules = getModules();
if ( modules != null )
{
- for ( Iterator<String> it = modules.iterator(); it.hasNext(); )
+ for ( String modulePath : modules )
{
- String modulePath = it.next();
String moduleName = modulePath;
if ( moduleName.endsWith( "/" ) || moduleName.endsWith( "\\" ) )
@@ -1248,10 +1247,8 @@ public class MavenProject
List<Extension> extensions = getBuildExtensions();
if ( extensions != null )
{
- for ( Iterator<Extension> i = extensions.iterator(); i.hasNext(); )
+ for ( Extension ext : extensions )
{
- Extension ext = i.next();
-
String version;
if ( StringUtils.isEmpty( ext.getVersion() ) )
{
@@ -1262,7 +1259,8 @@ public class MavenProject
version = ext.getVersion();
}
- Artifact artifact = repositorySystem.createArtifact( ext.getGroupId(), ext.getArtifactId(), version, null, "jar" );
+ Artifact artifact =
+ repositorySystem.createArtifact( ext.getGroupId(), ext.getArtifactId(), version, null, "jar" );
if ( artifact != null )
{
@@ -1556,10 +1554,8 @@ public class MavenProject
if ( getReportPlugins() != null )
{
- for ( Iterator<ReportPlugin> iterator = getReportPlugins().iterator(); iterator.hasNext(); )
+ for ( ReportPlugin plugin : getReportPlugins() )
{
- ReportPlugin plugin = iterator.next();
-
if ( pluginGroupId.equals( plugin.getGroupId() ) && pluginArtifactId.equals( plugin.getArtifactId() ) )
{
dom = (Xpp3Dom) plugin.getConfiguration();
@@ -1668,10 +1664,8 @@ public class MavenProject
if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null ) && ( deps.size() > 0 ) )
{
map = new HashMap<String, Artifact>();
- for ( Iterator<Dependency> i = dependencyManagement.getDependencies().iterator(); i.hasNext(); )
+ for ( Dependency d : dependencyManagement.getDependencies() )
{
- Dependency d = i.next();
-
Artifact artifact = repositorySystem.createDependencyArtifact( d );
if ( artifact == null )
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
index 776f314..6a8e7f6 100644
--- a/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
@@ -78,23 +78,22 @@ public class DefaultJavaToolchainFactory
//TODO possibly move at least parts to a utility method or abstract implementation.
dom = (Xpp3Dom) model.getProvides();
Xpp3Dom[] provides = dom.getChildren();
- for ( int i = 0; i < provides.length; i++ )
+ for ( Xpp3Dom provide : provides )
{
- String key = provides[i].getName();
- String value = provides[i].getValue();
+ String key = provide.getName();
+ String value = provide.getValue();
if ( value == null )
{
- throw new MisconfiguredToolchainException( "Provides token '" + key + "' doesn't have any value configured." );
+ throw new MisconfiguredToolchainException(
+ "Provides token '" + key + "' doesn't have any value configured." );
}
if ( "version".equals( key ) )
{
- jtc.addProvideToken( key,
- RequirementMatcherFactory.createVersionMatcher( value ) );
+ jtc.addProvideToken( key, RequirementMatcherFactory.createVersionMatcher( value ) );
}
else
{
- jtc.addProvideToken( key,
- RequirementMatcherFactory.createExactMatcher( value ) );
+ jtc.addProvideToken( key, RequirementMatcherFactory.createExactMatcher( value ) );
}
}
return jtc;
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index 15dbed8..7f1cef7 100644
--- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -59,10 +59,8 @@ public class DefaultMavenProjectBuilderTest
if ( !filesToDelete.isEmpty() )
{
- for ( Iterator<File> it = filesToDelete.iterator(); it.hasNext(); )
+ for ( File file : filesToDelete )
{
- File file = it.next();
-
if ( file.exists() )
{
if ( file.isDirectory() )
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index 73a906a..5ca56d8 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -161,10 +161,8 @@ public class CLIManager
StringBuilder currentArg = null;
- for ( int i = 0; i < args.length; i++ )
+ for ( String arg : args )
{
- String arg = args[i];
-
boolean addedToBuffer = false;
if ( arg.startsWith( "\"" ) )
http://git-wip-us.apache.org/repos/asf/maven/blob/d92746dc/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 004f264..1c142c4 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -865,9 +865,9 @@ public class MavenCli
String[] profileOptionValues = commandLine.getOptionValues( CLIManager.ACTIVATE_PROFILES );
if ( profileOptionValues != null )
{
- for ( int i = 0; i < profileOptionValues.length; ++i )
+ for ( String profileOptionValue : profileOptionValues )
{
- StringTokenizer profileTokens = new StringTokenizer( profileOptionValues[i], "," );
+ StringTokenizer profileTokens = new StringTokenizer( profileOptionValue, "," );
while ( profileTokens.hasMoreTokens() )
{
@@ -978,9 +978,9 @@ public class MavenCli
{
String[] values = commandLine.getOptionValues( CLIManager.PROJECT_LIST );
List<String> projects = new ArrayList<String>();
- for ( int i = 0; i < values.length; i++ )
+ for ( String value : values )
{
- String[] tmp = StringUtils.split( values[i], "," );
+ String[] tmp = StringUtils.split( value, "," );
projects.addAll( Arrays.asList( tmp ) );
}
request.setSelectedProjects( projects );
@@ -1076,9 +1076,9 @@ public class MavenCli
if ( defStrs != null )
{
- for ( int i = 0; i < defStrs.length; ++i )
+ for ( String defStr : defStrs )
{
- setCliProperty( defStrs[i], userProperties );
+ setCliProperty( defStr, userProperties );
}
}
}
[10/14] git commit: Code cleanup - Redundant array creation for
calling varargs method
Posted by ah...@apache.org.
Code cleanup - Redundant array creation for calling varargs method
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/da48cfff
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da48cfff
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da48cfff
Branch: refs/heads/slf4j-log4j2
Commit: da48cfff8381a28f69bc22693d19b97484d46ab0
Parents: d92746d
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 22:27:26 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 22:27:26 2013 +0200
----------------------------------------------------------------------
.../apache/maven/repository/internal/RepositorySystemTest.java | 2 +-
.../interpolation/AbstractStringBasedModelInterpolator.java | 2 +-
.../org/apache/maven/AbstractCoreMavenComponentTestCase.java | 4 ++--
.../interpolation/AbstractStringBasedModelInterpolator.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/da48cfff/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
index ffe1bc1..36bb9c5 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/RepositorySystemTest.java
@@ -173,7 +173,7 @@ public class RepositorySystemTest
req3.setArtifact( new DefaultArtifact( "ut.simple:artifact:zip:classifier:1.0" ) );
req3.addRepository( newTestRepository() );
- List<ArtifactRequest> requests = Arrays.asList( new ArtifactRequest[] { req1, req2, req3 } );
+ List<ArtifactRequest> requests = Arrays.asList( req1, req2, req3 );
List<ArtifactResult> results = system.resolveArtifacts( session, requests );
http://git-wip-us.apache.org/repos/asf/maven/blob/da48cfff/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
index e5b6b0f..dfc3dee 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
@@ -65,7 +65,7 @@ public abstract class AbstractStringBasedModelInterpolator
extends AbstractLogEnabled
implements ModelInterpolator, Initializable
{
- private static final List<String> PROJECT_PREFIXES = Arrays.asList( new String[]{ "pom.", "project." } );
+ private static final List<String> PROJECT_PREFIXES = Arrays.asList( "pom.", "project." );
private static final List<String> TRANSLATED_PATH_EXPRESSIONS;
http://git-wip-us.apache.org/repos/asf/maven/blob/da48cfff/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
index 813a128..6534fc1 100644
--- a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
@@ -108,11 +108,11 @@ public abstract class AbstractCoreMavenComponentTestCase
.setPom( pom )
.setProjectPresent( true )
.setShowErrors( true )
- .setPluginGroups( Arrays.asList( new String[] { "org.apache.maven.plugins" } ) )
+ .setPluginGroups( Arrays.asList( "org.apache.maven.plugins" ) )
.setLocalRepository( getLocalRepository() )
.setRemoteRepositories( getRemoteRepositories() )
.setPluginArtifactRepositories( getPluginArtifactRepositories() )
- .setGoals( Arrays.asList( new String[] { "package" } ) );
+ .setGoals( Arrays.asList( "package" ) );
return request;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/da48cfff/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
index f025036..863eb44 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
@@ -68,7 +68,7 @@ public abstract class AbstractStringBasedModelInterpolator
*/
private static final String BUILD_TIMESTAMP_FORMAT_PROPERTY = "maven.build.timestamp.format";
- private static final List<String> PROJECT_PREFIXES = Arrays.asList( new String[]{ "pom.", "project." } );
+ private static final List<String> PROJECT_PREFIXES = Arrays.asList( "pom.", "project." );
private static final Collection<String> TRANSLATED_PATH_EXPRESSIONS;
[14/14] git commit: Use custom distribution name
Posted by ah...@apache.org.
Use custom distribution name
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/bce345ea
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/bce345ea
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/bce345ea
Branch: refs/heads/slf4j-log4j2
Commit: bce345ea4e087afd254dd47c6081646cbda3d3cd
Parents: 7c95f80
Author: Arnaud Héritier <ah...@apache.org>
Authored: Sat Jun 1 22:35:19 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Fri Jun 14 10:31:21 2013 +0200
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/bce345ea/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6b93808..6ffed22 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@ END SNIPPET: ant-bootstrap -->
<property name="distributionDirectory" value="apache-maven"/>
<property name="distributionId" value="apache-maven"/>
<property name="distributionShortName" value="Maven"/>
- <property name="distributionName" value="Apache Maven"/>
+ <property name="distributionName" value="Apache Maven (Log4J2)"/>
<property name="it.workdir.version" value="3.0.x" />
<property name="maven-compile.jvmargs" value="-Xmx512m -Xms512m"/>
<property name="maven-compile.fork" value="true"/>
[11/14] git commit: Code cleanup - Remove Redundant Cast(s)
Posted by ah...@apache.org.
Code cleanup - Remove Redundant Cast(s)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/456268af
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/456268af
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/456268af
Branch: refs/heads/slf4j-log4j2
Commit: 456268af61206a14e492c5983d7f045fc7254531
Parents: da48cff
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 22:28:48 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 22:28:48 2013 +0200
----------------------------------------------------------------------
.../artifact/versioning/VersionRangeTest.java | 102 +++++++++----------
.../DefaultLegacyArtifactCollector.java | 6 +-
.../metadata/MetadataResolutionResult.java | 4 +-
.../transform/TransformationManagerTest.java | 2 +-
.../apache/maven/project/ModelUtilsTest.java | 2 +-
.../inheritance/t00/ProjectInheritanceTest.java | 2 +-
.../inheritance/t02/ProjectInheritanceTest.java | 2 +-
.../resolver/DefaultArtifactCollectorTest.java | 2 +-
.../canonical/CanonicalProjectBuilderTest.java | 4 +-
9 files changed, 63 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
index 5845f2a..e155941 100644
--- a/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
+++ b/maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java
@@ -57,7 +57,7 @@ public class VersionRangeTest
VersionRange range = VersionRange.createFromVersionSpec( "(,1.0]" );
List<Restriction> restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- Restriction restriction = (Restriction) restrictions.get( 0 );
+ Restriction restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
@@ -70,7 +70,7 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.0", range.getRecommendedVersion().toString() );
restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -81,7 +81,7 @@ public class VersionRangeTest
range = VersionRange.createFromVersionSpec( "[1.0]" );
restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
@@ -93,7 +93,7 @@ public class VersionRangeTest
range = VersionRange.createFromVersionSpec( "[1.2,1.3]" );
restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
@@ -105,7 +105,7 @@ public class VersionRangeTest
range = VersionRange.createFromVersionSpec( "[1.0,2.0)" );
restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "2.0", restriction.getUpperBound().toString() );
@@ -117,7 +117,7 @@ public class VersionRangeTest
range = VersionRange.createFromVersionSpec( "[1.5,)" );
restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -129,13 +129,13 @@ public class VersionRangeTest
range = VersionRange.createFromVersionSpec( "(,1.0],[1.2,)" );
restrictions = range.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
assertNull( CHECK_VERSION_RECOMMENDATION, range.getRecommendedVersion() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -183,7 +183,7 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.0", mergedRange.getRecommendedVersion().toString() );
List<Restriction> restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- Restriction restriction = (Restriction) restrictions.get( 0 );
+ Restriction restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -193,7 +193,7 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -206,7 +206,7 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.0", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -218,7 +218,7 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -230,7 +230,7 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getLowerBound().toString() );
@@ -242,7 +242,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -254,7 +254,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -266,7 +266,7 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
@@ -278,7 +278,7 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.1", mergedRange.getRecommendedVersion().toString() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
@@ -290,7 +290,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
@@ -302,7 +302,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
@@ -314,12 +314,12 @@ public class VersionRangeTest
assertEquals( CHECK_VERSION_RECOMMENDATION, "1.2", mergedRange.getRecommendedVersion().toString() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -331,12 +331,12 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.0", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -348,12 +348,12 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertNull( CHECK_LOWER_BOUND, restriction.getLowerBound() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertNull( CHECK_UPPER_BOUND, restriction.getUpperBound() );
@@ -365,7 +365,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
@@ -377,7 +377,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
@@ -389,7 +389,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
@@ -401,7 +401,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
@@ -413,7 +413,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
@@ -425,7 +425,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
@@ -437,7 +437,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.2", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.3", restriction.getUpperBound().toString() );
@@ -449,7 +449,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
@@ -468,7 +468,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.1", restriction.getUpperBound().toString() );
@@ -480,7 +480,7 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 1, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.4", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
@@ -492,12 +492,12 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
@@ -509,12 +509,12 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
@@ -526,12 +526,12 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
@@ -543,12 +543,12 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertFalse( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertFalse( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
@@ -581,12 +581,12 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 2, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
@@ -598,17 +598,17 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 3, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 2 );
+ restriction = restrictions.get( 2 );
assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.5", restriction.getUpperBound().toString() );
@@ -620,17 +620,17 @@ public class VersionRangeTest
assertNull( CHECK_VERSION_RECOMMENDATION, mergedRange.getRecommendedVersion() );
restrictions = mergedRange.getRestrictions();
assertEquals( CHECK_NUM_RESTRICTIONS, 3, restrictions.size() );
- restriction = (Restriction) restrictions.get( 0 );
+ restriction = restrictions.get( 0 );
assertEquals( CHECK_LOWER_BOUND, "1.1", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.2", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 1 );
+ restriction = restrictions.get( 1 );
assertEquals( CHECK_LOWER_BOUND, "1.3", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.4", restriction.getUpperBound().toString() );
assertTrue( CHECK_UPPER_BOUND_INCLUSIVE, restriction.isUpperBoundInclusive() );
- restriction = (Restriction) restrictions.get( 2 );
+ restriction = restrictions.get( 2 );
assertEquals( CHECK_LOWER_BOUND, "1.5", restriction.getLowerBound().toString() );
assertTrue( CHECK_LOWER_BOUND_INCLUSIVE, restriction.isLowerBoundInclusive() );
assertEquals( CHECK_UPPER_BOUND, "1.6", restriction.getUpperBound().toString() );
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
index d69e812..f734416 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
@@ -219,7 +219,7 @@ public class DefaultLegacyArtifactCollector
}
/* remove the originating artifact if it is also in managed versions to avoid being modified during resolution */
- Artifact managedOriginatingArtifact = (Artifact) versionMap.get( originatingArtifact.getDependencyConflictId() );
+ Artifact managedOriginatingArtifact = versionMap.get( originatingArtifact.getDependencyConflictId() );
if ( managedOriginatingArtifact != null )
{
@@ -465,7 +465,7 @@ public class DefaultLegacyArtifactCollector
// added to the artifact before we retrive the metadata
// for the artifact; otherwise we may end up with unwanted
// dependencies.
- Artifact ma = (Artifact) managedVersions.get( childKey );
+ Artifact ma = managedVersions.get( childKey );
ArtifactFilter managedExclusionFilter = ma.getDependencyFilter();
if ( null != managedExclusionFilter )
{
@@ -602,7 +602,7 @@ public class DefaultLegacyArtifactCollector
private void manageArtifact( ResolutionNode node, ManagedVersionMap managedVersions,
List<ResolutionListener> listeners )
{
- Artifact artifact = (Artifact) managedVersions.get( node.getKey() );
+ Artifact artifact = managedVersions.get( node.getKey() );
// Before we update the version of the artifact, we need to know
// whether we are working on a transitive dependency or not. This
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
index 263f906..1d9e9c4 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
@@ -63,8 +63,8 @@ public class MetadataResolutionResult
public void initTreeProcessing( PlexusContainer plexus )
throws ComponentLookupException
{
- classpathTransformation = (ClasspathTransformation) plexus.lookup( ClasspathTransformation.class );
- conflictResolver = (GraphConflictResolver) plexus.lookup( GraphConflictResolver.class );
+ classpathTransformation = plexus.lookup( ClasspathTransformation.class );
+ conflictResolver = plexus.lookup( GraphConflictResolver.class );
}
//----------------------------------------------------------------------------
public MetadataGraph getGraph()
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
index 93b466c..3845092 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/transform/TransformationManagerTest.java
@@ -30,7 +30,7 @@ public class TransformationManagerTest
public void testTransformationManager()
throws Exception
{
- ArtifactTransformationManager tm = (ArtifactTransformationManager) lookup( ArtifactTransformationManager.class );
+ ArtifactTransformationManager tm = lookup( ArtifactTransformationManager.class );
List tms = tm.getArtifactTransformations();
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
index 06b2e1d..9c0cbd1 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/ModelUtilsTest.java
@@ -54,7 +54,7 @@ public class ModelUtilsTest
ModelUtils.mergePluginDefinitions( plugin, mgtPlugin, false );
- assertEquals( dep.getVersion(), ((Dependency) plugin.getDependencies().get( 0 ) ).getVersion() );
+ assertEquals( dep.getVersion(), plugin.getDependencies().get( 0 ).getVersion() );
}
private Dependency createDependency( String gid,
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
index 4b98a23..0ee7980 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
@@ -68,7 +68,7 @@ public class ProjectInheritanceTest
// Value taken from p2
// ----------------------------------------------------------------------
- assertEquals( "mailing-list", ( (MailingList) p4.getMailingLists().get( 0 ) ).getName() );
+ assertEquals( "mailing-list", p4.getMailingLists().get( 0 ).getName() );
// ----------------------------------------------------------------------
// Value taken from p1
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
index 43ba71d..2bcf7b5 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
@@ -95,7 +95,7 @@ public class ProjectInheritanceTest
// Value taken from p2
// ----------------------------------------------------------------------
- assertEquals( "mailing-list", ( (MailingList) project4.getMailingLists().get( 0 ) ).getName() );
+ assertEquals( "mailing-list", project4.getMailingLists().get( 0 ).getName() );
// ----------------------------------------------------------------------
// Value taken from p1
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index f8fe1a3..58dd3fa 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -76,7 +76,7 @@ public class DefaultArtifactCollectorTest
source = new Source();
artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
- artifactCollector = (LegacyArtifactCollector) lookup( LegacyArtifactCollector.class );
+ artifactCollector = lookup( LegacyArtifactCollector.class );
projectArtifact = createArtifactSpec( "project", "1.0", null );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/456268af/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
index 5421f94..8b6454d 100644
--- a/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
@@ -86,9 +86,9 @@ public class CanonicalProjectBuilderTest
List<PluginExecution> executions = plugin.getExecutions();
- PluginExecution execution = (PluginExecution) executions.get( 0 );
+ PluginExecution execution = executions.get( 0 );
- String g0 = (String) execution.getGoals().get( 0 );
+ String g0 = execution.getGoals().get( 0 );
assertEquals( "plexus:runtime", g0 );
[05/14] git commit: Code cleanup - It's better (for perfs) to use a
chain of append() calls than a unique append with several Strings
concatenations
Posted by ah...@apache.org.
Code cleanup - It's better (for perfs) to use a chain of append() calls than a unique append with several Strings concatenations
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c8e94a5b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c8e94a5b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c8e94a5b
Branch: refs/heads/slf4j-log4j2
Commit: c8e94a5b085b1cb1543861d40db7a7a108bef499
Parents: c747fbe
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 21:58:50 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 21:58:50 2013 +0200
----------------------------------------------------------------------
.../AbstractArtifactResolutionException.java | 5 +++--
.../project/validation/ModelValidationResult.java | 3 ++-
.../repository/metadata/ClasspathContainer.java | 4 ++--
.../maven/repository/metadata/MetadataGraph.java | 6 +++---
.../repository/metadata/MetadataGraphVertex.java | 8 ++++----
.../maven/plugin/PluginParameterException.java | 4 ++--
.../java/org/apache/maven/cli/CLIReportingUtils.java | 15 ++++++++-------
.../java/org/apache/maven/cli/CLIManagerTest.java | 2 +-
8 files changed, 25 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c8e94a5b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
index 9cfc36b..393e028 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
@@ -199,13 +199,14 @@ public class AbstractArtifactResolutionException
if ( message == null || !message.contains( "from the specified remote repositories:" ) )
{
sb.append( LS );
- sb.append( " " + groupId + ":" + artifactId + ":" + type + ":" + version );
+ sb.append( " " ).append( groupId ).append( ":" ).append( artifactId ).append( ":" ).append( type ).append(
+ ":" ).append( version );
sb.append( LS );
if ( remoteRepositories != null )
{
sb.append( LS );
sb.append( "from the specified remote repositories:" );
- sb.append( LS + " " );
+ sb.append( LS ).append( " " );
if ( remoteRepositories.isEmpty() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/c8e94a5b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
index 12ead7e..cb8c601 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
@@ -85,7 +85,8 @@ public class ModelValidationResult
//
for ( int i = 0; i < messages.size(); i++ )
{
- message.append( indentation + "[" + i + "] " + messages.get( i ) + NEWLINE );
+ message.append( indentation ).append( "[" ).append( i ).append( "] " ).append( messages.get( i ) ).append(
+ NEWLINE );
}
return message.toString();
http://git-wip-us.apache.org/repos/asf/maven/blob/c8e94a5b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
index 593daac..cdf28f6 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
@@ -129,12 +129,12 @@ implements Iterable<ArtifactMetadata>
public String toString()
{
StringBuilder sb = new StringBuilder( 256 );
- sb.append( "[scope=" + scope.getScope() );
+ sb.append( "[scope=" ).append( scope.getScope() );
if ( classpath != null )
{
for ( ArtifactMetadata md : classpath )
{
- sb.append( ": " + md.toString() + '{' + md.getArtifactUri() + '}' );
+ sb.append( ": " ).append( md.toString() ).append( '{' ).append( md.getArtifactUri() ).append( '}' );
}
}
sb.append( ']' );
http://git-wip-us.apache.org/repos/asf/maven/blob/c8e94a5b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
index b116c69..55b0250 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
@@ -485,13 +485,13 @@ public class MetadataGraph
}
for ( MetadataGraphVertex v : vertices )
{
- sb.append( "Vertex: " + v.getMd().toString() + "\n" );
+ sb.append( "Vertex: " ).append( v.getMd().toString() ).append( "\n" );
List<MetadataGraphEdge> ins = getIncidentEdges( v );
if ( ins != null )
{
for ( MetadataGraphEdge e : ins )
{
- sb.append( " from : " + e.toString() + "\n" );
+ sb.append( " from : " ).append( e.toString() ).append( "\n" );
}
}
else
@@ -504,7 +504,7 @@ public class MetadataGraph
{
for ( MetadataGraphEdge e : outs )
{
- sb.append( " to : " + e.toString() + "\n" );
+ sb.append( " to : " ).append( e.toString() ).append( "\n" );
}
}
else
http://git-wip-us.apache.org/repos/asf/maven/blob/c8e94a5b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
index 87ff70b..202a01f 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
@@ -192,17 +192,17 @@ public class MetadataGraphVertex
return super.hashCode();
}
StringBuilder hashString = new StringBuilder( 128 );
- hashString.append( md.groupId + "|" );
- hashString.append( md.artifactId + "|" );
+ hashString.append( md.groupId ).append( "|" );
+ hashString.append( md.artifactId ).append( "|" );
if ( compareVersion )
{
- hashString.append( md.version + "|" );
+ hashString.append( md.version ).append( "|" );
}
if ( compareScope )
{
- hashString.append( md.getArtifactScope() + "|" );
+ hashString.append( md.getArtifactScope() ).append( "|" );
}
return hashString.toString().hashCode();
http://git-wip-us.apache.org/repos/asf/maven/blob/c8e94a5b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
index f14bfc0..dfdd432 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
@@ -144,8 +144,8 @@ public class PluginParameterException
String alias = param.getAlias();
if ( StringUtils.isNotEmpty( alias ) && !alias.equals( param.getName() ) )
{
- messageBuffer.append(
- "\n\n-OR-\n\n<configuration>\n ...\n <" + alias + ">VALUE</" + alias + ">\n</configuration>\n" );
+ messageBuffer.append( "\n\n-OR-\n\n<configuration>\n ...\n <" ).append( alias ).append(
+ ">VALUE</" ).append( alias ).append( ">\n</configuration>\n" );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/c8e94a5b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 0ed30dc..186f937 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -55,13 +55,14 @@ public final class CLIReportingUtils
version.append( createMavenVersionString( properties ) ).append( LS );
version.append( reduce( properties.getProperty( "distributionShortName" ) + " home: "
+ System.getProperty( "maven.home", "<unknown maven home>" ) ) ).append( LS );
- version.append( "Java version: " + System.getProperty( "java.version", "<unknown java version>" )
- + ", vendor: " + System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( LS );
- version.append( "Java home: " + System.getProperty( "java.home", "<unknown java home>" ) ).append( LS );
- version.append( "Default locale: " + Locale.getDefault() + ", platform encoding: "
- + System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( LS );
- version.append( "OS name: \"" + Os.OS_NAME + "\", version: \"" + Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH
- + "\", family: \"" + Os.OS_FAMILY + "\"" );
+ version.append( "Java version: " ).append(
+ System.getProperty( "java.version", "<unknown java version>" ) ).append( ", vendor: " ).append(
+ System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( LS );
+ version.append( "Java home: " ).append( System.getProperty( "java.home", "<unknown java home>" ) ).append( LS );
+ version.append( "Default locale: " ).append( Locale.getDefault() ).append( ", platform encoding: " ).append(
+ System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( LS );
+ version.append( "OS name: \"" ).append( Os.OS_NAME ).append( "\", version: \"" ).append( Os.OS_VERSION ).append(
+ "\", arch: \"" ).append( Os.OS_ARCH ).append( "\", family: \"" ).append( Os.OS_FAMILY ).append( "\"" );
return version.toString();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/c8e94a5b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
index 716127b..9df1768 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
@@ -70,7 +70,7 @@ public class CLIManagerTest
for ( Option option : new CLIManagerExtension().getOptions() )
{
a = !a;
- sb.append( "<tr class='" + ( a ? 'a' : 'b' ) + "'><td><code>-<a name='" );
+ sb.append( "<tr class='" ).append( a ? 'a' : 'b' ).append( "'><td><code>-<a name='" );
sb.append( option.getOpt() );
sb.append( "'>" );
sb.append( option.getOpt() );
[07/14] git commit: Code cleanup - Various code simplifications (tests, loops, …)
Posted by ah...@apache.org.
Code cleanup - Various code simplifications (tests, loops, …)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9e5183f0
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9e5183f0
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9e5183f0
Branch: refs/heads/slf4j-log4j2
Commit: 9e5183f0ad9dc2bdbf0feaabd9c70a4d26b79382
Parents: 87a5532
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 22:09:51 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 22:09:51 2013 +0200
----------------------------------------------------------------------
.../maven/artifact/versioning/Restriction.java | 6 +-----
.../metadata/DefaultRepositoryMetadataManager.java | 9 +--------
.../StringSearchModelInterpolator.java | 1 -
.../apache/maven/repository/MetadataGraphNode.java | 2 +-
.../resolver/DefaultArtifactResolverTest.java | 2 +-
.../resolver/filter/ExclusionSetFilter.java | 6 +-----
.../maven/lifecycle/internal/DependencyContext.java | 9 ++-------
.../internal/DefaultPluginVersionResolver.java | 1 -
.../maven/project/artifact/MavenMetadataSource.java | 16 ++++------------
.../model/validation/DefaultModelValidator.java | 8 ++------
.../maven/plugin/descriptor/MojoDescriptor.java | 6 +-----
11 files changed, 14 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
index 5787def..d73d7ea 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
@@ -170,12 +170,8 @@ public class Restriction
return false;
}
- if ( upperBoundInclusive != restriction.upperBoundInclusive )
- {
- return false;
- }
+ return upperBoundInclusive == restriction.upperBoundInclusive;
- return true;
}
public String toString()
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
index cbdcf07..c94d24c 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -122,14 +122,7 @@ public class DefaultRepositoryMetadataManager
+ ") in favor of local copy" );
}
}
- else if ( updateCheckManager.isUpdateRequired( metadata, repository, file ) )
- {
- update = true;
- }
- else
- {
- update = false;
- }
+ else update = updateCheckManager.isUpdateRequired( metadata, repository, file );
if ( update )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index 68f282b..1ef5579 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -288,7 +288,6 @@ public class StringSearchModelInterpolator
+ cls.getName()
+ "; it is an unmodifiable collection." );
}
- continue;
}
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
index 22394e7..c8b9ab4 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
@@ -80,7 +80,7 @@ public class MetadataGraphNode
return metadata == null;
}
- return metadata == null ? false : metadata.toString().equals( node2.metadata.toString() );
+ return metadata != null && metadata.toString().equals( node2.metadata.toString() );
}
else
{
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
index 8e7b284..40d94c2 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
@@ -68,7 +68,7 @@ public class DefaultArtifactResolverTest
// we want to see all top-level thread groups
ThreadGroup tg = Thread.currentThread().getThreadGroup();
- while ( !( tg.getParent() != null ) )
+ while ( tg.getParent() == null )
{
tg = tg.getParent();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
index 7d8740b..45ce845 100644
--- a/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
+++ b/maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ExclusionSetFilter.java
@@ -54,12 +54,8 @@ public class ExclusionSetFilter
id = artifact.getGroupId() + ':' + id;
- if ( excludes.contains( id ) )
- {
- return false;
- }
+ return !excludes.contains( id );
- return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
index 54e5756..bed9a73 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DependencyContext.java
@@ -92,13 +92,8 @@ public class DependencyContext
public boolean isResolutionRequiredForCurrentProject()
{
- if ( lastDependencyArtifacts != project.getDependencyArtifacts()
- || ( lastDependencyArtifacts != null && lastDependencyArtifactCount != lastDependencyArtifacts.size() ) )
- {
- return true;
-
- }
- return false;
+ return lastDependencyArtifacts != project.getDependencyArtifacts() || ( lastDependencyArtifacts != null
+ && lastDependencyArtifactCount != lastDependencyArtifacts.size() );
}
public boolean isResolutionRequiredForAggregatedProjects( Collection<String> scopesToCollect,
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index 95e0ba8..5efa809 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -196,7 +196,6 @@ public class DefaultPluginVersionResolver
}
catch ( InvalidVersionSpecificationException e )
{
- continue;
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index d56fdc6..002134b 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -734,12 +734,8 @@ public class MavenMetadataSource
{
return true;
}
- if ( e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
- && e.getCause().getCause() instanceof ArtifactNotFoundException )
- {
- return true;
- }
- return false;
+ return e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
+ && e.getCause().getCause() instanceof ArtifactNotFoundException;
}
private boolean isNonTransferrablePom( Exception e )
@@ -748,12 +744,8 @@ public class MavenMetadataSource
{
return true;
}
- if ( e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
- && !( e.getCause().getCause() instanceof ArtifactNotFoundException ) )
- {
- return true;
- }
- return false;
+ return e.getCause() instanceof org.eclipse.aether.resolution.ArtifactResolutionException
+ && !( e.getCause().getCause() instanceof ArtifactNotFoundException );
}
private Properties getSystemProperties()
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index a1dbb47..67d255f 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -781,13 +781,9 @@ public class DefaultModelValidator
return false;
}
- if ( !validateBannedCharacters( fieldName, problems, severity, version, string, sourceHint, tracker,
- ILLEGAL_VERSION_CHARS ) )
- {
- return false;
- }
+ return validateBannedCharacters( fieldName, problems, severity, version, string, sourceHint, tracker,
+ ILLEGAL_VERSION_CHARS );
- return true;
}
private boolean validate20ProperSnapshotVersion( String fieldName, ModelProblemCollector problems, Severity severity, Version version,
http://git-wip-us.apache.org/repos/asf/maven/blob/9e5183f0/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index 8c3d9da..f084b13 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -545,12 +545,8 @@ public class MojoDescriptor
return false;
}
- if ( !compareObjects( getGoal(), other.getGoal() ) )
- {
- return false;
- }
+ return compareObjects( getGoal(), other.getGoal() );
- return true;
}
return false;
[04/14] git commit: Code cleanup - Remove useless .toString()
Posted by ah...@apache.org.
Code cleanup - Remove useless .toString()
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c747fbe4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c747fbe4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c747fbe4
Branch: refs/heads/slf4j-log4j2
Commit: c747fbe4c916c92486f27c4fc25113150d948f6c
Parents: a2897f8
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 21:52:36 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 21:52:36 2013 +0200
----------------------------------------------------------------------
.../org/apache/maven/project/validation/ModelValidationResult.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/c747fbe4/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
index b41b0b3..12ead7e 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
@@ -85,7 +85,7 @@ public class ModelValidationResult
//
for ( int i = 0; i < messages.size(); i++ )
{
- message.append( indentation + "[" + i + "] " + messages.get( i ).toString() + NEWLINE );
+ message.append( indentation + "[" + i + "] " + messages.get( i ) + NEWLINE );
}
return message.toString();
[08/14] git commit: Code cleanup - Maven requires Java 5+ : Replace
String.indexOf() by String.contains()
Posted by ah...@apache.org.
Code cleanup - Maven requires Java 5+ : Replace String.indexOf() by String.contains()
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1f84f8f2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1f84f8f2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1f84f8f2
Branch: refs/heads/slf4j-log4j2
Commit: 1f84f8f29631fcd50873ae9cd89f9e8a7600e349
Parents: 9e5183f
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 22:19:20 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 22:19:20 2013 +0200
----------------------------------------------------------------------
.../versioning/DefaultArtifactVersion.java | 4 ++--
.../AbstractStringBasedModelInterpolator.java | 2 +-
.../resolver/DefaultArtifactCollectorTest.java | 4 ++--
.../PluginParameterExpressionEvaluator.java | 2 +-
.../internal/ConcurrentBuildLoggerTest.java | 2 +-
.../AbstractStringBasedModelInterpolator.java | 2 +-
.../activation/FileProfileActivator.java | 2 +-
.../validation/DefaultModelValidatorTest.java | 24 ++++++++++----------
8 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/1f84f8f2/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
index db71dc7..856eb13 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
@@ -143,7 +143,7 @@ public class DefaultArtifactVersion
}
}
- if ( ( part1.indexOf( "." ) < 0 ) && !part1.startsWith( "0" ) )
+ if ( ( !part1.contains( "." ) ) && !part1.startsWith( "0" ) )
{
try
{
@@ -178,7 +178,7 @@ public class DefaultArtifactVersion
}
// string tokenzier won't detect these and ignores them
- if ( part1.indexOf( ".." ) >= 0 || part1.startsWith( "." ) || part1.endsWith( "." ) )
+ if ( part1.contains( ".." ) || part1.startsWith( "." ) || part1.endsWith( "." ) )
{
fallback = true;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/1f84f8f2/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
index 102e391..e5b6b0f 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
@@ -290,7 +290,7 @@ public abstract class AbstractStringBasedModelInterpolator
List<InterpolationPostProcessor> postProcessors, boolean debug )
throws ModelInterpolationException
{
- if ( src.indexOf( "${" ) < 0 )
+ if ( !src.contains( "${" ) )
{
return src;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/1f84f8f2/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index 2bb8c93..7c48507 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -712,8 +712,8 @@ public class DefaultArtifactCollectorTest
}
catch ( OverConstrainedVersionException e )
{
- assertTrue( "Versions unordered", e.getMessage().indexOf( "[3.2.1-v3235e, 3.3.0-v3346]" ) != -1 );
- assertTrue( "DependencyTrail unresolved", e.getMessage().indexOf( "Path to dependency:" ) != -1 );
+ assertTrue( "Versions unordered", e.getMessage().contains( "[3.2.1-v3235e, 3.3.0-v3346]" ) );
+ assertTrue( "DependencyTrail unresolved", e.getMessage().contains( "Path to dependency:" ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/1f84f8f2/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
index 5c703ce..b4b9492 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
@@ -172,7 +172,7 @@ public class PluginParameterExpressionEvaluator
}
// Was not an expression
- if ( expression.indexOf( "$$" ) > -1 )
+ if ( expression.contains( "$$" ) )
{
return expression.replaceAll( "\\$\\$", "\\$" );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/1f84f8f2/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLoggerTest.java
----------------------------------------------------------------------
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLoggerTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLoggerTest.java
index 115c0d3..7eb7348 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLoggerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ConcurrentBuildLoggerTest.java
@@ -69,6 +69,6 @@ public class ConcurrentBuildLoggerTest
b1.addWait( A, aPlan.next(), System.currentTimeMillis() );
b2.addWait( A, aPlan.next(), System.currentTimeMillis() );
final String response = concurrentBuildLogger.toGraph();
- assertTrue( response.indexOf( "digraph" ) >= 0 );
+ assertTrue( response.contains( "digraph" ) );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/1f84f8f2/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
index 57e11c3..f025036 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
@@ -216,7 +216,7 @@ public abstract class AbstractStringBasedModelInterpolator
List<? extends InterpolationPostProcessor> postProcessors,
ModelProblemCollector problems )
{
- if ( src.indexOf( "${" ) < 0 )
+ if ( !src.contains( "${" ) )
{
return src;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/1f84f8f2/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index b4ecf26..bcad941 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
@@ -113,7 +113,7 @@ public class FileProfileActivator
}
} );
}
- else if ( path.indexOf( "${basedir}" ) >= 0 )
+ else if ( path.contains( "${basedir}" ) )
{
return false;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/1f84f8f2/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
index 7af3ee5..065a06f 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/validation/DefaultModelValidatorTest.java
@@ -131,7 +131,7 @@ public class DefaultModelValidatorTest
assertViolations( result, 0, 1, 0 );
- assertTrue( result.getErrors().get( 0 ).indexOf( "modelVersion" ) > -1 );
+ assertTrue( result.getErrors().get( 0 ).contains( "modelVersion" ) );
}
public void testMissingArtifactId()
@@ -193,7 +193,7 @@ public class DefaultModelValidatorTest
assertViolations( result, 0, 1, 0 );
- assertTrue( result.getErrors().get( 0 ).indexOf( "Aggregator projects require 'pom' as packaging." ) > -1 );
+ assertTrue( result.getErrors().get( 0 ).contains( "Aggregator projects require 'pom' as packaging." ) );
}
public void testMissingDependencyArtifactId()
@@ -203,8 +203,8 @@ public class DefaultModelValidatorTest
assertViolations( result, 0, 1, 0 );
- assertTrue( result.getErrors().get( 0 ).indexOf(
- "'dependencies.dependency.artifactId' for groupId:null:jar is missing" ) > -1 );
+ assertTrue( result.getErrors().get( 0 ).contains(
+ "'dependencies.dependency.artifactId' for groupId:null:jar is missing" ) );
}
public void testMissingDependencyGroupId()
@@ -214,8 +214,8 @@ public class DefaultModelValidatorTest
assertViolations( result, 0, 1, 0 );
- assertTrue( result.getErrors().get( 0 ).indexOf(
- "'dependencies.dependency.groupId' for null:artifactId:jar is missing" ) > -1 );
+ assertTrue( result.getErrors().get( 0 ).contains(
+ "'dependencies.dependency.groupId' for null:artifactId:jar is missing" ) );
}
public void testMissingDependencyVersion()
@@ -225,8 +225,8 @@ public class DefaultModelValidatorTest
assertViolations( result, 0, 1, 0 );
- assertTrue( result.getErrors().get( 0 ).indexOf(
- "'dependencies.dependency.version' for groupId:artifactId:jar is missing" ) > -1 );
+ assertTrue( result.getErrors().get( 0 ).contains(
+ "'dependencies.dependency.version' for groupId:artifactId:jar is missing" ) );
}
public void testMissingDependencyManagementArtifactId()
@@ -236,8 +236,8 @@ public class DefaultModelValidatorTest
assertViolations( result, 0, 1, 0 );
- assertTrue( result.getErrors().get( 0 ).indexOf(
- "'dependencyManagement.dependencies.dependency.artifactId' for groupId:null:jar is missing" ) > -1 );
+ assertTrue( result.getErrors().get( 0 ).contains(
+ "'dependencyManagement.dependencies.dependency.artifactId' for groupId:null:jar is missing" ) );
}
public void testMissingDependencyManagementGroupId()
@@ -247,8 +247,8 @@ public class DefaultModelValidatorTest
assertViolations( result, 0, 1, 0 );
- assertTrue( result.getErrors().get( 0 ).indexOf(
- "'dependencyManagement.dependencies.dependency.groupId' for null:artifactId:jar is missing" ) > -1 );
+ assertTrue( result.getErrors().get( 0 ).contains(
+ "'dependencyManagement.dependencies.dependency.groupId' for null:artifactId:jar is missing" ) );
}
public void testMissingAll()
[12/14] git commit: Revert "Code cleanup - It's better (for perfs) to
use a chain of append() calls than a unique append with several Strings
concatenations"
Posted by ah...@apache.org.
Revert "Code cleanup - It's better (for perfs) to use a chain of append() calls than a unique append with several Strings concatenations"
This reverts commit c8e94a5b085b1cb1543861d40db7a7a108bef499.
Decreases too much the code readibility
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/21907a74
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/21907a74
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/21907a74
Branch: refs/heads/slf4j-log4j2
Commit: 21907a74e7aa802ab19e0ab68ca1116f847776b4
Parents: 456268a
Author: Arnaud Héritier <ah...@apache.org>
Authored: Fri Jun 14 10:28:27 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Fri Jun 14 10:29:43 2013 +0200
----------------------------------------------------------------------
.../AbstractArtifactResolutionException.java | 5 ++---
.../project/validation/ModelValidationResult.java | 3 +--
.../repository/metadata/ClasspathContainer.java | 4 ++--
.../maven/repository/metadata/MetadataGraph.java | 6 +++---
.../repository/metadata/MetadataGraphVertex.java | 8 ++++----
.../maven/plugin/PluginParameterException.java | 4 ++--
.../java/org/apache/maven/cli/CLIReportingUtils.java | 15 +++++++--------
.../java/org/apache/maven/cli/CLIManagerTest.java | 2 +-
8 files changed, 22 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/21907a74/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
----------------------------------------------------------------------
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
index 393e028..9cfc36b 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
@@ -199,14 +199,13 @@ public class AbstractArtifactResolutionException
if ( message == null || !message.contains( "from the specified remote repositories:" ) )
{
sb.append( LS );
- sb.append( " " ).append( groupId ).append( ":" ).append( artifactId ).append( ":" ).append( type ).append(
- ":" ).append( version );
+ sb.append( " " + groupId + ":" + artifactId + ":" + type + ":" + version );
sb.append( LS );
if ( remoteRepositories != null )
{
sb.append( LS );
sb.append( "from the specified remote repositories:" );
- sb.append( LS ).append( " " );
+ sb.append( LS + " " );
if ( remoteRepositories.isEmpty() )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/21907a74/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
index cb8c601..12ead7e 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
@@ -85,8 +85,7 @@ public class ModelValidationResult
//
for ( int i = 0; i < messages.size(); i++ )
{
- message.append( indentation ).append( "[" ).append( i ).append( "] " ).append( messages.get( i ) ).append(
- NEWLINE );
+ message.append( indentation + "[" + i + "] " + messages.get( i ) + NEWLINE );
}
return message.toString();
http://git-wip-us.apache.org/repos/asf/maven/blob/21907a74/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
index cdf28f6..593daac 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/ClasspathContainer.java
@@ -129,12 +129,12 @@ implements Iterable<ArtifactMetadata>
public String toString()
{
StringBuilder sb = new StringBuilder( 256 );
- sb.append( "[scope=" ).append( scope.getScope() );
+ sb.append( "[scope=" + scope.getScope() );
if ( classpath != null )
{
for ( ArtifactMetadata md : classpath )
{
- sb.append( ": " ).append( md.toString() ).append( '{' ).append( md.getArtifactUri() ).append( '}' );
+ sb.append( ": " + md.toString() + '{' + md.getArtifactUri() + '}' );
}
}
sb.append( ']' );
http://git-wip-us.apache.org/repos/asf/maven/blob/21907a74/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
index 55b0250..b116c69 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
@@ -485,13 +485,13 @@ public class MetadataGraph
}
for ( MetadataGraphVertex v : vertices )
{
- sb.append( "Vertex: " ).append( v.getMd().toString() ).append( "\n" );
+ sb.append( "Vertex: " + v.getMd().toString() + "\n" );
List<MetadataGraphEdge> ins = getIncidentEdges( v );
if ( ins != null )
{
for ( MetadataGraphEdge e : ins )
{
- sb.append( " from : " ).append( e.toString() ).append( "\n" );
+ sb.append( " from : " + e.toString() + "\n" );
}
}
else
@@ -504,7 +504,7 @@ public class MetadataGraph
{
for ( MetadataGraphEdge e : outs )
{
- sb.append( " to : " ).append( e.toString() ).append( "\n" );
+ sb.append( " to : " + e.toString() + "\n" );
}
}
else
http://git-wip-us.apache.org/repos/asf/maven/blob/21907a74/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
index 202a01f..87ff70b 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
@@ -192,17 +192,17 @@ public class MetadataGraphVertex
return super.hashCode();
}
StringBuilder hashString = new StringBuilder( 128 );
- hashString.append( md.groupId ).append( "|" );
- hashString.append( md.artifactId ).append( "|" );
+ hashString.append( md.groupId + "|" );
+ hashString.append( md.artifactId + "|" );
if ( compareVersion )
{
- hashString.append( md.version ).append( "|" );
+ hashString.append( md.version + "|" );
}
if ( compareScope )
{
- hashString.append( md.getArtifactScope() ).append( "|" );
+ hashString.append( md.getArtifactScope() + "|" );
}
return hashString.toString().hashCode();
http://git-wip-us.apache.org/repos/asf/maven/blob/21907a74/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
index dfdd432..f14bfc0 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
@@ -144,8 +144,8 @@ public class PluginParameterException
String alias = param.getAlias();
if ( StringUtils.isNotEmpty( alias ) && !alias.equals( param.getName() ) )
{
- messageBuffer.append( "\n\n-OR-\n\n<configuration>\n ...\n <" ).append( alias ).append(
- ">VALUE</" ).append( alias ).append( ">\n</configuration>\n" );
+ messageBuffer.append(
+ "\n\n-OR-\n\n<configuration>\n ...\n <" + alias + ">VALUE</" + alias + ">\n</configuration>\n" );
}
}
http://git-wip-us.apache.org/repos/asf/maven/blob/21907a74/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 186f937..0ed30dc 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -55,14 +55,13 @@ public final class CLIReportingUtils
version.append( createMavenVersionString( properties ) ).append( LS );
version.append( reduce( properties.getProperty( "distributionShortName" ) + " home: "
+ System.getProperty( "maven.home", "<unknown maven home>" ) ) ).append( LS );
- version.append( "Java version: " ).append(
- System.getProperty( "java.version", "<unknown java version>" ) ).append( ", vendor: " ).append(
- System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( LS );
- version.append( "Java home: " ).append( System.getProperty( "java.home", "<unknown java home>" ) ).append( LS );
- version.append( "Default locale: " ).append( Locale.getDefault() ).append( ", platform encoding: " ).append(
- System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( LS );
- version.append( "OS name: \"" ).append( Os.OS_NAME ).append( "\", version: \"" ).append( Os.OS_VERSION ).append(
- "\", arch: \"" ).append( Os.OS_ARCH ).append( "\", family: \"" ).append( Os.OS_FAMILY ).append( "\"" );
+ version.append( "Java version: " + System.getProperty( "java.version", "<unknown java version>" )
+ + ", vendor: " + System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( LS );
+ version.append( "Java home: " + System.getProperty( "java.home", "<unknown java home>" ) ).append( LS );
+ version.append( "Default locale: " + Locale.getDefault() + ", platform encoding: "
+ + System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( LS );
+ version.append( "OS name: \"" + Os.OS_NAME + "\", version: \"" + Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH
+ + "\", family: \"" + Os.OS_FAMILY + "\"" );
return version.toString();
}
http://git-wip-us.apache.org/repos/asf/maven/blob/21907a74/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
index 9df1768..716127b 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
@@ -70,7 +70,7 @@ public class CLIManagerTest
for ( Option option : new CLIManagerExtension().getOptions() )
{
a = !a;
- sb.append( "<tr class='" ).append( a ? 'a' : 'b' ).append( "'><td><code>-<a name='" );
+ sb.append( "<tr class='" + ( a ? 'a' : 'b' ) + "'><td><code>-<a name='" );
sb.append( option.getOpt() );
sb.append( "'>" );
sb.append( option.getOpt() );
[06/14] git commit: Code cleanup - Remove useless semi-colons
Posted by ah...@apache.org.
Code cleanup - Remove useless semi-colons
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/87a5532e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/87a5532e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/87a5532e
Branch: refs/heads/slf4j-log4j2
Commit: 87a5532eb9100f52a4cc724d2c38ec1806711b46
Parents: c8e94a5
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 22:04:29 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 22:04:29 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/maven/model/building/ModelCacheTag.java | 4 ++--
.../main/java/org/apache/maven/model/building/ModelProblem.java | 2 +-
.../java/org/apache/maven/settings/building/SettingsProblem.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/87a5532e/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
index 3967e3b..14cb827 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
@@ -112,12 +112,12 @@ interface ModelCacheTag<T>
public DependencyManagement intoCache( DependencyManagement data )
{
return ( data != null ) ? data.clone() : null;
- };
+ }
public DependencyManagement fromCache( DependencyManagement data )
{
return intoCache( data );
- };
+ }
};
http://git-wip-us.apache.org/repos/asf/maven/blob/87a5532e/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
index 555f033..08a1483 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
@@ -37,7 +37,7 @@ public interface ModelProblem
FATAL, //
ERROR, //
- WARNING; //
+ WARNING //
}
http://git-wip-us.apache.org/repos/asf/maven/blob/87a5532e/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java
index 0b399ed..c0798cd 100644
--- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java
+++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsProblem.java
@@ -37,7 +37,7 @@ public interface SettingsProblem
FATAL, //
ERROR, //
- WARNING; //
+ WARNING //
}
[02/14] git commit: Code cleanup - Maven requires Java 5+ : Remove
unnecessary boxing
Posted by ah...@apache.org.
Code cleanup - Maven requires Java 5+ : Remove unnecessary boxing
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/96db1abb
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/96db1abb
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/96db1abb
Branch: refs/heads/slf4j-log4j2
Commit: 96db1abbe9ab3e52dc438cd5c25ae4366dcf2e32
Parents: 143216f
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 21:43:53 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 21:43:53 2013 +0200
----------------------------------------------------------------------
.../internal/DefaultArtifactDescriptorReader.java | 2 +-
.../repository/internal/util/ConsoleTransferListener.java | 2 +-
.../interpolation/StringSearchModelInterpolator.java | 2 +-
.../maven/repository/legacy/TransferListenerAdapter.java | 4 ++--
.../project/inheritance/t02/ProjectInheritanceTest.java | 10 +++++-----
.../src/main/java/org/apache/maven/DefaultMaven.java | 2 +-
.../org/apache/maven/project/DefaultProjectBuilder.java | 2 +-
.../maven/cli/transfer/ConsoleMavenTransferListener.java | 2 +-
.../apache/maven/model/building/DefaultModelBuilder.java | 2 +-
.../org/apache/maven/model/merge/MavenModelMerger.java | 4 ++--
10 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index 60a183c..380a607 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -248,7 +248,7 @@ public class DefaultArtifactDescriptorReader
}
List<License> licenses = model.getLicenses();
- properties.put( "license.count", Integer.valueOf( licenses.size() ) );
+ properties.put( "license.count", licenses.size() );
for ( int i = 0; i < licenses.size(); i++ )
{
License license = licenses.get( i );
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
index f5e8580..1b77d4d 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
@@ -62,7 +62,7 @@ public class ConsoleTransferListener
public void transferProgressed( TransferEvent event )
{
TransferResource resource = event.getResource();
- downloads.put( resource, Long.valueOf( event.getTransferredBytes() ) );
+ downloads.put( resource, event.getTransferredBytes() );
StringBuilder buffer = new StringBuilder( 64 );
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index da1f84a..68f282b 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -354,7 +354,7 @@ public class StringSearchModelInterpolator
{
if ( !fieldIsPrimitiveByClass.containsKey( fieldType ) )
{
- fieldIsPrimitiveByClass.put( fieldType, Boolean.valueOf( fieldType.isPrimitive() ) );
+ fieldIsPrimitiveByClass.put( fieldType, fieldType.isPrimitive() );
}
if ( fieldIsPrimitiveByClass.get( fieldType ).booleanValue() )
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
index eb6e895..d6836cb 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
@@ -110,11 +110,11 @@ public class TransferListenerAdapter
transferred = transfers.get( transferEvent.getResource() );
if ( transferred == null )
{
- transferred = Long.valueOf( length );
+ transferred = (long) length;
}
else
{
- transferred = Long.valueOf( transferred.longValue() + length );
+ transferred = transferred.longValue() + length;
}
transfers.put( transferEvent.getResource(), transferred );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
index 927027c..43ba71d 100644
--- a/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
@@ -123,12 +123,12 @@ public class ProjectInheritanceTest
String testPluginArtifactId = "maven-compiler-plugin";
// this is the plugin we're looking for.
- validPluginCounts.put( testPluginArtifactId, new Integer( 0 ) );
+ validPluginCounts.put( testPluginArtifactId, 0 );
// these are injected if -DperformRelease=true
- validPluginCounts.put( "maven-deploy-plugin", new Integer( 0 ) );
- validPluginCounts.put( "maven-javadoc-plugin", new Integer( 0 ) );
- validPluginCounts.put( "maven-source-plugin", new Integer( 0 ) );
+ validPluginCounts.put( "maven-deploy-plugin", 0 );
+ validPluginCounts.put( "maven-javadoc-plugin", 0 );
+ validPluginCounts.put( "maven-source-plugin", 0 );
Plugin testPlugin = null;
@@ -157,7 +157,7 @@ public class ProjectInheritanceTest
}
else
{
- count = new Integer( count.intValue() + 1 );
+ count = count.intValue() + 1;
validPluginCounts.put( pluginArtifactId, count );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 2d7f9a9..aaddef0 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -335,7 +335,7 @@ public class DefaultMaven
Map<Object, Object> configProps = new LinkedHashMap<Object, Object>();
configProps.put( ConfigurationProperties.USER_AGENT, getUserAgent() );
- configProps.put( ConfigurationProperties.INTERACTIVE, Boolean.valueOf( request.isInteractiveMode() ) );
+ configProps.put( ConfigurationProperties.INTERACTIVE, request.isInteractiveMode() );
configProps.putAll( request.getSystemProperties() );
configProps.putAll( request.getUserProperties() );
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 744d231..a5abc29 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -651,7 +651,7 @@ public class DefaultProjectBuilder
Boolean profilesXml = profilesXmls.get( basedir );
if ( profilesXml == null )
{
- profilesXml = Boolean.valueOf( new File( basedir, "profiles.xml" ).exists() );
+ profilesXml = new File( basedir, "profiles.xml" ).exists();
profilesXmls.put( basedir, profilesXml );
}
if ( profilesXml.booleanValue() )
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
index f5f4abc..bfc84c0 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/transfer/ConsoleMavenTransferListener.java
@@ -50,7 +50,7 @@ public class ConsoleMavenTransferListener
throws TransferCancelledException
{
TransferResource resource = event.getResource();
- downloads.put( resource, Long.valueOf( event.getTransferredBytes() ) );
+ downloads.put( resource, event.getTransferredBytes() );
StringBuilder buffer = new StringBuilder( 64 );
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 0d264cf..09718ec 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -444,7 +444,7 @@ public class DefaultModelBuilder
InputSource source = request.isLocationTracking() ? new InputSource() : null;
Map<String, Object> options = new HashMap<String, Object>();
- options.put( ModelProcessor.IS_STRICT, Boolean.valueOf( strict ) );
+ options.put( ModelProcessor.IS_STRICT, strict );
options.put( ModelProcessor.INPUT_SOURCE, source );
options.put( ModelProcessor.SOURCE, modelSource );
http://git-wip-us.apache.org/repos/asf/maven/blob/96db1abb/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
index 568bbcb..0c35033 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
@@ -252,7 +252,7 @@ public class MavenModelMerger
merged.addAll( tgt );
for ( int i = 0, n = tgt.size(); i < n; i++ )
{
- indices.add( Integer.valueOf( i ) );
+ indices.add( i );
}
for ( int i = 0, n = src.size(); i < n; i++ )
{
@@ -260,7 +260,7 @@ public class MavenModelMerger
if ( !excludes.contains( s ) )
{
merged.add( s );
- indices.add( Integer.valueOf( ~i ) );
+ indices.add( ~i );
}
}
target.setModules( merged );
[03/14] git commit: Code cleanup - Maven requires Java 5+ : Remove
unnecessary unboxing
Posted by ah...@apache.org.
Code cleanup - Maven requires Java 5+ : Remove unnecessary unboxing
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a2897f86
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a2897f86
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a2897f86
Branch: refs/heads/slf4j-log4j2
Commit: a2897f86b3628d1ba8b7fe4a79eef46f2545f13e
Parents: 96db1ab
Author: Arnaud Héritier <ah...@apache.org>
Authored: Tue Jun 11 21:47:18 2013 +0200
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Tue Jun 11 21:47:18 2013 +0200
----------------------------------------------------------------------
.../repository/internal/util/ConsoleTransferListener.java | 2 +-
.../maven/artifact/resolver/DefaultArtifactResolver.java | 2 +-
.../src/main/java/org/apache/maven/project/ModelUtils.java | 8 ++++----
.../inheritance/DefaultModelInheritanceAssembler.java | 4 ++--
.../maven/repository/legacy/TransferListenerAdapter.java | 2 +-
.../main/java/org/apache/maven/cli/CLIReportingUtils.java | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
index 1b77d4d..fb44283 100644
--- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
+++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java
@@ -69,7 +69,7 @@ public class ConsoleTransferListener
for ( Map.Entry<TransferResource, Long> entry : downloads.entrySet() )
{
long total = entry.getKey().getContentLength();
- long complete = entry.getValue().longValue();
+ long complete = entry.getValue();
buffer.append( getStatus( complete, total ) ).append( " " );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 9a9b31a..fff16e0 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -101,7 +101,7 @@ public class DefaultArtifactResolver
public DefaultArtifactResolver()
{
- int threads = Integer.getInteger( "maven.artifact.threads", 5 ).intValue();
+ int threads = Integer.getInteger( "maven.artifact.threads", 5 );
if ( threads <= 1 )
{
executor = new Executor()
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
index 758c78f..92b5eb9 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java
@@ -75,7 +75,7 @@ public final class ModelUtils
String inherited = plugin.getInherited();
- if ( ( inherited != null ) && !Boolean.valueOf( inherited ).booleanValue() )
+ if ( ( inherited != null ) && !Boolean.valueOf( inherited ) )
{
it.remove();
}
@@ -96,7 +96,7 @@ public final class ModelUtils
// 2. the parent's <inherited/> flag is not set
// 3. the parent's <inherited/> flag is set to true
if ( !handleAsInheritance || ( parentInherited == null )
- || Boolean.valueOf( parentInherited ).booleanValue() )
+ || Boolean.valueOf( parentInherited ) )
{
Plugin childPlugin = (Plugin) childPlugins.get( parentPlugin.getKey() );
@@ -216,7 +216,7 @@ public final class ModelUtils
// from here to the end of the method is dealing with merging of the <executions/> section.
String parentInherited = parent.getInherited();
- boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited ).booleanValue();
+ boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited );
List<PluginExecution> parentExecutions = parent.getExecutions();
@@ -233,7 +233,7 @@ public final class ModelUtils
String inherited = parentExecution.getInherited();
boolean parentExecInherited =
- parentIsInherited && ( ( inherited == null ) || Boolean.valueOf( inherited ).booleanValue() );
+ parentIsInherited && ( ( inherited == null ) || Boolean.valueOf( inherited ) );
if ( !handleAsInheritance || parentExecInherited )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
index b16e389..85f7526 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
@@ -389,7 +389,7 @@ public class DefaultModelInheritanceAssembler
String parentInherited = parentPlugin.getInherited();
if ( !handleAsInheritance || ( parentInherited == null )
- || Boolean.valueOf( parentInherited ).booleanValue() )
+ || Boolean.valueOf( parentInherited ) )
{
ReportPlugin assembledPlugin = parentPlugin;
@@ -481,7 +481,7 @@ public class DefaultModelInheritanceAssembler
// from here to the end of the method is dealing with merging of the <executions/> section.
String parentInherited = parent.getInherited();
- boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited ).booleanValue();
+ boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited );
List parentReportSets = parent.getReportSets();
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
index d6836cb..497828d 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java
@@ -74,7 +74,7 @@ public class TransferListenerAdapter
}
if ( transferred != null )
{
- event.setTransferredBytes( transferred.longValue() );
+ event.setTransferredBytes( transferred );
}
synchronized ( artifacts )
http://git-wip-us.apache.org/repos/asf/maven/blob/a2897f86/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 6173959..0ed30dc 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -87,7 +87,7 @@ public final class CLIReportingUtils
if ( timestamp != null )
{
SimpleDateFormat fmt = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ssZ" );
- String ts = fmt.format( new Date( Long.valueOf( timestamp ).longValue() ) );
+ String ts = fmt.format( new Date( Long.valueOf( timestamp ) ) );
msg += ( rev != null ? "; " : "" ) + ts;
}
msg += ")";
[13/14] git commit: Ported equivalent changes from logback branch.
Posted by ah...@apache.org.
Ported equivalent changes from logback branch.
- Should be the same as 7f9e280522379fc0f3ac09f4d81e8188cdb54192 only with log4j2 as the backing impl
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7c95f804
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7c95f804
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7c95f804
Branch: refs/heads/slf4j-log4j2
Commit: 7c95f8045e58560c0331c1ccb946540067e895c5
Parents: 21907a7
Author: Stephen Connolly <st...@gmail.com>
Authored: Wed Dec 12 09:31:25 2012 +0000
Committer: Arnaud Héritier <ah...@apache.org>
Committed: Fri Jun 14 10:31:21 2013 +0200
----------------------------------------------------------------------
apache-maven/pom.xml | 14 +++++++-
apache-maven/src/conf/logging/log4j2-color.xml | 36 +++++++++++++++++++++
apache-maven/src/conf/logging/log4j2.xml | 36 +++++++++++++++++++++
maven-embedder/pom.xml | 12 +++++--
pom.xml | 27 +++++++++++++++-
5 files changed, 121 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 7e3dea8..1355c88 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -85,7 +85,19 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/apache-maven/src/conf/logging/log4j2-color.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/logging/log4j2-color.xml b/apache-maven/src/conf/logging/log4j2-color.xml
new file mode 100644
index 0000000..bea1e76
--- /dev/null
+++ b/apache-maven/src/conf/logging/log4j2-color.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+
+<configuration>
+ <properties>
+ <property name="maven.logging.root.level">INFO</property>
+ </properties>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%highlight{[%p{WARN=WARNING}]} %msg%n%throwable" />
+ </Console>
+ </appenders>
+ <loggers>
+ <root level="${sys:maven.logging.root.level}">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/apache-maven/src/conf/logging/log4j2.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/logging/log4j2.xml b/apache-maven/src/conf/logging/log4j2.xml
new file mode 100644
index 0000000..6635597
--- /dev/null
+++ b/apache-maven/src/conf/logging/log4j2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+
+<configuration> <!--status="debug"-->
+ <properties>
+ <property name="maven.logging.root.level">INFO</property>
+ </properties>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="[%p{WARN=WARNING}] %msg%n%throwable"/>
+ </Console>
+ </appenders>
+ <loggers>
+ <root level="${sys:maven.logging.root.level}">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 609044c..3e842b5 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -76,14 +76,22 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
<!-- CLI -->
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/maven/blob/7c95f804/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d3117fc..a92ee16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,9 @@
<modelloVersion>1.7</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<aetherVersion>0.9.0.M2</aetherVersion>
- <slf4jVersion>1.7.4</slf4jVersion>
+ <slf4jVersion>1.7.5</slf4jVersion>
+ <log4j2Version>2.0-beta6</log4j2Version>
+ <jansiVersion>1.11</jansiVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
@@ -238,6 +240,29 @@
<version>1.0.7</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>${slf4jVersion}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2Version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2Version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>${jansiVersion}</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- Wagon -->
<dependency>
<groupId>org.apache.maven.wagon</groupId>