Author: hboutemy Date: Thu Oct 30 07:03:49 2014 New Revision: 1635410 URL: http://svn.apache.org/r1635410 Log: upgraded parent pom
Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java Modified: maven/shared/trunk/maven-dependency-analyzer/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/pom.xml?rev=1635410&r1=1635409&r2=1635410&view=diff ============================================================================== --- maven/shared/trunk/maven-dependency-analyzer/pom.xml (original) +++ maven/shared/trunk/maven-dependency-analyzer/pom.xml Thu Oct 30 07:03:49 2014 @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-components</artifactId> - <version>20</version> + <version>21</version> <relativePath>../maven-shared-components/pom.xml</relativePath> </parent> Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java?rev=1635410&r1=1635409&r2=1635410&view=diff ============================================================================== --- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java (original) +++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultClassAnalyzer.java Thu Oct 30 07:03:49 2014 @@ -47,11 +47,12 @@ public class DefaultClassAnalyzer { ClassFileVisitorUtils.accept( url, visitor ); } - catch( ZipException e ) + catch ( ZipException e ) { // since the current ZipException gives no indication what jar file is corrupted // we prefer to wrap another ZipException for better error visibility - ZipException ze = new ZipException( "Cannot process Jar entry on URL: " + url + " due to " + e.getMessage() ); + ZipException ze = + new ZipException( "Cannot process Jar entry on URL: " + url + " due to " + e.getMessage() ); ze.initCause( e ); throw ze; } Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1635410&r1=1635409&r2=1635410&view=diff ============================================================================== --- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java (original) +++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java Thu Oct 30 07:03:49 2014 @@ -175,6 +175,7 @@ public class DefaultProjectDependencyAna } catch ( IOException ignore ) { + // ingore } } } @@ -225,7 +226,8 @@ public class DefaultProjectDependencyAna return declaredArtifacts; } - private Set<Artifact> buildUsedArtifacts( Map<Artifact, Set<String>> artifactClassMap, Set<String> dependencyClasses ) + private Set<Artifact> buildUsedArtifacts( Map<Artifact, Set<String>> artifactClassMap, + Set<String> dependencyClasses ) { Set<Artifact> usedArtifacts = new HashSet<Artifact>(); Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java?rev=1635410&r1=1635409&r2=1635410&view=diff ============================================================================== --- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java (original) +++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java Thu Oct 30 07:03:49 2014 @@ -153,7 +153,7 @@ public class ProjectDependencyAnalysis StringBuilder builder = new StringBuilder(); if ( !forced.isEmpty() ) { - builder.append("not declared: ").append(forced); + builder.append( "not declared: " ).append( forced ); } if ( !used.isEmpty() ) { @@ -161,7 +161,7 @@ public class ProjectDependencyAnalysis { builder.append( " and " ); } - builder.append("declared but already detected as used: ").append(used); + builder.append( "declared but already detected as used: " ).append( used ); } throw new ProjectDependencyAnalyzerException( "Trying to force use of dependencies which are " + builder ); } @@ -214,7 +214,7 @@ public class ProjectDependencyAnalysis if ( !getUsedUndeclaredArtifacts().isEmpty() ) { - if ( buffer.length() > 0) + if ( buffer.length() > 0 ) { buffer.append( "," ); } @@ -224,7 +224,7 @@ public class ProjectDependencyAnalysis if ( !getUnusedDeclaredArtifacts().isEmpty() ) { - if ( buffer.length() > 0) + if ( buffer.length() > 0 ) { buffer.append( "," ); } @@ -244,7 +244,7 @@ public class ProjectDependencyAnalysis private Set<Artifact> safeCopy( Set<Artifact> set ) { - return ( set == null ) ? Collections.<Artifact> emptySet() + return ( set == null ) ? Collections.<Artifact>emptySet() : Collections.unmodifiableSet( new LinkedHashSet<Artifact>( set ) ); } } Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java?rev=1635410&r1=1635409&r2=1635410&view=diff ============================================================================== --- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java (original) +++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java Thu Oct 30 07:03:49 2014 @@ -72,6 +72,8 @@ public class ResultCollector case Type.OBJECT: addName( t.getClassName().replace( '.', '/' ) ); break; + + default: } }