Updated Branches: refs/heads/master 2acec0557 -> 3849bbd46
fixed errors reported by Checkstyle Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/3849bbd4 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/3849bbd4 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/3849bbd4 Branch: refs/heads/master Commit: 3849bbd46a77c24aa72ec6949b5c96ad5e52847f Parents: 2acec05 Author: Hervé Boutemy <[email protected]> Authored: Sun Dec 16 21:49:18 2012 +0100 Committer: Hervé Boutemy <[email protected]> Committed: Sun Dec 16 21:49:18 2012 +0100 ---------------------------------------------------------------------- .../artifact/versioning/ComparableVersion.java | 2 +- .../artifact/resolver/DefaultArtifactResolver.java | 8 ++-- .../resolver/transform/ArtifactTransformation.java | 11 ++-- .../transform/ArtifactTransformationManager.java | 1 - .../execution/DefaultMavenExecutionResult.java | 3 +- .../maven/execution/MavenExecutionRequest.java | 28 +++++----- .../lifecycle/internal/CurrentPhaseForThread.java | 7 +-- .../DefaultLifecycleExecutionPlanCalculator.java | 40 ++++++++------- .../internal/DefaultLifecyclePluginAnalyzer.java | 4 +- .../lifecycle/internal/ExecutionPlanItem.java | 4 +- .../lifecycle/internal/LifecycleWeaveBuilder.java | 3 +- 11 files changed, 56 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java ---------------------------------------------------------------------- diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java index 481e845..6f06614 100644 --- a/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java +++ b/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java @@ -86,7 +86,7 @@ public class ComparableVersion private static class IntegerItem implements Item { - private static final BigInteger BIG_INTEGER_ZERO = new BigInteger( "0" ); + private static final BigInteger BIG_INTEGER_ZERO = new BigInteger( "0" ); private final BigInteger value; http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/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 18deeb2..5833d06 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 @@ -557,18 +557,18 @@ public class DefaultArtifactResolver /** * ThreadCreator for creating daemon threads with fixed ThreadGroup-name. */ - final static class DaemonThreadCreator + static final class DaemonThreadCreator implements ThreadFactory { static final String THREADGROUP_NAME = "org.apache.maven.artifact.resolver.DefaultArtifactResolver"; - final static ThreadGroup group = new ThreadGroup( THREADGROUP_NAME ); + static final ThreadGroup GROUP = new ThreadGroup( THREADGROUP_NAME ); - final static AtomicInteger threadNumber = new AtomicInteger( 1 ); + static final AtomicInteger THREAD_NUMBER = new AtomicInteger( 1 ); public Thread newThread( Runnable r ) { - Thread newThread = new Thread( group, r, "resolver-" + threadNumber.getAndIncrement() ); + Thread newThread = new Thread( GROUP, r, "resolver-" + THREAD_NUMBER.getAndIncrement() ); newThread.setDaemon( true ); return newThread; } http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java index 1a5606f..42604d7 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java @@ -38,18 +38,17 @@ public interface ArtifactTransformation /** * Take in a artifact and return the transformed artifact for locating in the remote repository. If no - * transformation has occured the original artifact is returned. + * transformation has occurred the original artifact is returned. * * @param artifact Artifact to be transformed. * @param request the repositories to check - * @param localRepository the local repository */ void transformForResolve( Artifact artifact, RepositoryRequest request ) throws ArtifactResolutionException, ArtifactNotFoundException; /** * Take in a artifact and return the transformed artifact for locating in the remote repository. If no - * transformation has occured the original artifact is returned. + * transformation has occurred the original artifact is returned. * * @param artifact Artifact to be transformed. * @param remoteRepositories the repositories to check @@ -62,7 +61,7 @@ public interface ArtifactTransformation /** * Take in a artifact and return the transformed artifact for locating in the local repository. If no - * transformation has occured the original artifact is returned. + * transformation has occurred the original artifact is returned. * * @param artifact Artifact to be transformed. * @param localRepository the local repository it will be stored in @@ -72,8 +71,8 @@ public interface ArtifactTransformation throws ArtifactInstallationException; /** - * Take in a artifact and return the transformed artifact for distributing toa remote repository. If no - * transformation has occured the original artifact is returned. + * Take in a artifact and return the transformed artifact for distributing to remote repository. If no + * transformation has occurred the original artifact is returned. * * @param artifact Artifact to be transformed. * @param remoteRepository the repository to deploy to http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java index 9137261..f0ac9c8 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java @@ -40,7 +40,6 @@ public interface ArtifactTransformationManager * * @param artifact Artifact to be transformed. * @param request the repositories to check - * @param localRepository the local repository */ void transformForResolve( Artifact artifact, RepositoryRequest request ) throws ArtifactResolutionException, ArtifactNotFoundException; http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java index d2f8111..cb22b38 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java +++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java @@ -19,7 +19,6 @@ package org.apache.maven.execution; * under the License. */ -import java.util.ArrayList; import java.util.Collections; import java.util.IdentityHashMap; import java.util.List; @@ -39,7 +38,7 @@ public class DefaultMavenExecutionResult private DependencyResolutionResult dependencyResolutionResult; - private List<Throwable> exceptions = new CopyOnWriteArrayList<Throwable>( ); + private List<Throwable> exceptions = new CopyOnWriteArrayList<Throwable>(); private Map<MavenProject, BuildSummary> buildSummaries; http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java index ef91ccf..ef88a17 100644 --- a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java +++ b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java @@ -45,45 +45,45 @@ public interface MavenExecutionRequest // Logging // ---------------------------------------------------------------------- - final int LOGGING_LEVEL_DEBUG = Logger.LEVEL_DEBUG; + int LOGGING_LEVEL_DEBUG = Logger.LEVEL_DEBUG; - final int LOGGING_LEVEL_INFO = Logger.LEVEL_INFO; + int LOGGING_LEVEL_INFO = Logger.LEVEL_INFO; - final int LOGGING_LEVEL_WARN = Logger.LEVEL_WARN; + int LOGGING_LEVEL_WARN = Logger.LEVEL_WARN; - final int LOGGING_LEVEL_ERROR = Logger.LEVEL_ERROR; + int LOGGING_LEVEL_ERROR = Logger.LEVEL_ERROR; - final int LOGGING_LEVEL_FATAL = Logger.LEVEL_FATAL; + int LOGGING_LEVEL_FATAL = Logger.LEVEL_FATAL; - final int LOGGING_LEVEL_DISABLED = Logger.LEVEL_DISABLED; + int LOGGING_LEVEL_DISABLED = Logger.LEVEL_DISABLED; // ---------------------------------------------------------------------- // Reactor Failure Mode // ---------------------------------------------------------------------- - final String REACTOR_FAIL_FAST = "FAIL_FAST"; + String REACTOR_FAIL_FAST = "FAIL_FAST"; - final String REACTOR_FAIL_AT_END = "FAIL_AT_END"; + String REACTOR_FAIL_AT_END = "FAIL_AT_END"; - final String REACTOR_FAIL_NEVER = "FAIL_NEVER"; + String REACTOR_FAIL_NEVER = "FAIL_NEVER"; // ---------------------------------------------------------------------- // Reactor Make Mode // ---------------------------------------------------------------------- - final String REACTOR_MAKE_UPSTREAM = "make-upstream"; + String REACTOR_MAKE_UPSTREAM = "make-upstream"; - final String REACTOR_MAKE_DOWNSTREAM = "make-downstream"; + String REACTOR_MAKE_DOWNSTREAM = "make-downstream"; - final String REACTOR_MAKE_BOTH = "make-both"; + String REACTOR_MAKE_BOTH = "make-both"; // ---------------------------------------------------------------------- // Artifact repository policies // ---------------------------------------------------------------------- - final String CHECKSUM_POLICY_FAIL = ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL; + String CHECKSUM_POLICY_FAIL = ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL; - final String CHECKSUM_POLICY_WARN = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN; + String CHECKSUM_POLICY_WARN = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN; // ---------------------------------------------------------------------- // http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CurrentPhaseForThread.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CurrentPhaseForThread.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CurrentPhaseForThread.java index 548bfca..f054253 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CurrentPhaseForThread.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/CurrentPhaseForThread.java @@ -29,17 +29,16 @@ package org.apache.maven.lifecycle.internal; */ class CurrentPhaseForThread { - private static final InheritableThreadLocal<String> threadPhase = new InheritableThreadLocal<String>(); - + private static final InheritableThreadLocal<String> THREAD_PHASE = new InheritableThreadLocal<String>(); public static void setPhase( String phase ) { - threadPhase.set( phase ); + THREAD_PHASE.set( phase ); } public static boolean isPhase( String phase ) { - return phase.equals( threadPhase.get() ); + return phase.equals( THREAD_PHASE.get() ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java index b28e6c0..58a7a62 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java @@ -1,18 +1,23 @@ +package org.apache.maven.lifecycle.internal; + /* - * 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 + * 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 + * 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. + * 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. */ -package org.apache.maven.lifecycle.internal; import java.io.IOException; import java.util.ArrayList; @@ -219,11 +224,10 @@ public class DefaultLifecycleExecutionPlanCalculator if ( lifecycle == null ) { - throw new LifecyclePhaseNotFoundException( - "Unknown lifecycle phase \"" + lifecyclePhase + "\". You must specify a valid lifecycle phase" + - " or a goal in the format <plugin-prefix>:<goal> or" + - " <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: " + - defaultLifeCycles.getLifecyclePhaseList() + ".", lifecyclePhase ); + throw new LifecyclePhaseNotFoundException( "Unknown lifecycle phase \"" + lifecyclePhase + + "\". You must specify a valid lifecycle phase" + " or a goal in the format <plugin-prefix>:<goal> or" + + " <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: " + + defaultLifeCycles.getLifecyclePhaseList() + ".", lifecyclePhase ); } /* @@ -432,8 +436,8 @@ public class DefaultLifecycleExecutionPlanCalculator { parameterConfiguration = new Xpp3Dom( parameterConfiguration, parameter.getName() ); - if ( StringUtils.isEmpty( parameterConfiguration.getAttribute( "implementation" ) ) && - StringUtils.isNotEmpty( parameter.getImplementation() ) ) + if ( StringUtils.isEmpty( parameterConfiguration.getAttribute( "implementation" ) ) + && StringUtils.isNotEmpty( parameter.getImplementation() ) ) { parameterConfiguration.setAttribute( "implementation", parameter.getImplementation() ); } http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java index afd0034..a5e6a34 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java @@ -80,8 +80,8 @@ public class DefaultLifecyclePluginAnalyzer { if ( logger.isDebugEnabled() ) { - logger.debug( "Looking up lifecyle mappings for packaging " + packaging + " from " + - Thread.currentThread().getContextClassLoader() ); + logger.debug( "Looking up lifecyle mappings for packaging " + packaging + " from " + + Thread.currentThread().getContextClassLoader() ); } LifecycleMapping lifecycleMappingForPackaging = lifecycleMappings.get( packaging ); http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java index 075524a..027b241 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java @@ -94,8 +94,8 @@ public class ExecutionPlanItem @Override public String toString() { - return "ExecutionPlanItem{" + ", mojoExecution=" + mojoExecution + ", schedule=" + schedule + '}' + - super.toString(); + return "ExecutionPlanItem{" + ", mojoExecution=" + mojoExecution + ", schedule=" + schedule + '}' + + super.toString(); } } http://git-wip-us.apache.org/repos/asf/maven/blob/3849bbd4/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java index 9447480..4cfae73 100644 --- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java +++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java @@ -212,7 +212,8 @@ public class LifecycleWeaveBuilder { Iterator<ExecutionPlanItem> planItems = executionPlan.iterator(); ExecutionPlanItem current = planItems.hasNext() ? planItems.next() : null; - ThreadLockedArtifact threadLockedArtifact = (ThreadLockedArtifact)projectBuild.getProject().getArtifact(); + ThreadLockedArtifact threadLockedArtifact = + (ThreadLockedArtifact) projectBuild.getProject().getArtifact(); if ( threadLockedArtifact != null ) { threadLockedArtifact.attachToThread();
