Author: hboutemy
Date: Sat May 30 14:39:56 2015
New Revision: 1682608
URL: http://svn.apache.org/r1682608
Log:
fixed errors reported by rat and Checkstyle
Modified:
maven/shared/trunk/maven-artifact-transfer/pom.xml
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven302RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/filter/TransformableFilter.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/EclipseAetherFilterTransformer.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/SonatypeAetherFilterTransformer.java
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManagerTest.java
Modified: maven/shared/trunk/maven-artifact-transfer/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/pom.xml?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
--- maven/shared/trunk/maven-artifact-transfer/pom.xml (original)
+++ maven/shared/trunk/maven-artifact-transfer/pom.xml Sat May 30 14:39:56 2015
@@ -77,6 +77,15 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>dependency-reduced-pom.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
Sat May 30 14:39:56 2015
@@ -24,9 +24,12 @@ import java.util.Collection;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ProjectBuildingRequest;
+/**
+ *
+ */
public interface ArtifactDeployer
{
- public void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
+ void deploy( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
throws ArtifactDeployerException;
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
Sat May 30 14:39:56 2015
@@ -19,6 +19,9 @@ package org.apache.maven.shared.artifact
* under the License.
*/
+/**
+ *
+ */
public class ArtifactDeployerException
extends Exception
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
Sat May 30 14:39:56 2015
@@ -33,6 +33,9 @@ import org.codehaus.plexus.context.Conte
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+/**
+ *
+ */
@Component( role = ArtifactDeployer.class )
public class DefaultArtifactDeployer
implements ArtifactDeployer, Contextualizable
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
Sat May 30 14:39:56 2015
@@ -35,12 +35,12 @@ import org.sonatype.aether.RepositorySys
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.deployment.DeployRequest;
import org.sonatype.aether.deployment.DeploymentException;
-import org.sonatype.aether.metadata.Metadata;
-import org.sonatype.aether.metadata.Metadata.Nature;
import org.sonatype.aether.repository.RemoteRepository;
import org.sonatype.aether.util.artifact.SubArtifact;
-import org.sonatype.aether.util.metadata.DefaultMetadata;
+/**
+ *
+ */
@Component( role = ArtifactDeployer.class, hint = "maven3" )
public class Maven30ArtifactDeployer
implements ArtifactDeployer
@@ -74,7 +74,7 @@ public class Maven30ArtifactDeployer
{
if ( metadata instanceof ProjectArtifactMetadata )
{
- org.sonatype.aether.artifact.Artifact pomArtifact = new
SubArtifact( aetherArtifact, "", "pom" );
+ Artifact pomArtifact = new SubArtifact( aetherArtifact,
"", "pom" );
pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
request.addArtifact( pomArtifact );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
Sat May 30 14:39:56 2015
@@ -23,6 +23,7 @@ import java.util.Collection;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import
org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
@@ -38,7 +39,10 @@ import org.eclipse.aether.deployment.Dep
import org.eclipse.aether.repository.RemoteRepository;
import org.eclipse.aether.util.artifact.SubArtifact;
-@Component( role = ArtifactDeployer.class , hint="maven31" )
+/**
+ *
+ */
+@Component( role = ArtifactDeployer.class, hint = "maven31" )
public class Maven31ArtifactDeployer implements ArtifactDeployer
{
@@ -62,7 +66,7 @@ public class Maven31ArtifactDeployer imp
RemoteRepository aetherRepository =
(RemoteRepository) Invoker.invoke(
RepositoryUtils.class, "toRepo",
-
org.apache.maven.artifact.repository.ArtifactRepository.class,
+
ArtifactRepository.class,
mavenArtifact.getRepository() );
request.setRepository( aetherRepository );
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
Sat May 30 14:39:56 2015
@@ -24,9 +24,12 @@ import java.util.Collection;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ProjectBuildingRequest;
+/**
+ *
+ */
public interface ArtifactInstaller
{
- public void install( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
+ void install( ProjectBuildingRequest request, Collection<Artifact>
mavenArtifacts )
throws ArtifactInstallerException;
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
Sat May 30 14:39:56 2015
@@ -19,6 +19,9 @@ package org.apache.maven.shared.artifact
* under the License.
*/
+/**
+ *
+ */
public class ArtifactInstallerException
extends Exception
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
Sat May 30 14:39:56 2015
@@ -33,6 +33,9 @@ import org.codehaus.plexus.context.Conte
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+/**
+ *
+ */
@Component( role = ArtifactInstaller.class )
public class DefaultArtifactInstaller
implements ArtifactInstaller, Contextualizable
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
Sat May 30 14:39:56 2015
@@ -37,6 +37,9 @@ import org.sonatype.aether.installation.
import org.sonatype.aether.installation.InstallationException;
import org.sonatype.aether.util.artifact.SubArtifact;
+/**
+ *
+ */
@Component( role = ArtifactInstaller.class, hint = "maven3" )
public class Maven30ArtifactInstaller
implements ArtifactInstaller
@@ -63,7 +66,7 @@ public class Maven30ArtifactInstaller
{
if ( metadata instanceof ProjectArtifactMetadata )
{
- org.sonatype.aether.artifact.Artifact pomArtifact = new
SubArtifact( mainArtifact, "", "pom" );
+ Artifact pomArtifact = new SubArtifact( mainArtifact, "",
"pom" );
pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
request.addArtifact( pomArtifact );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
Sat May 30 14:39:56 2015
@@ -37,7 +37,10 @@ import org.eclipse.aether.installation.I
import org.eclipse.aether.installation.InstallationException;
import org.eclipse.aether.util.artifact.SubArtifact;
-@Component( role = ArtifactInstaller.class , hint="maven31" )
+/**
+ *
+ */
+@Component( role = ArtifactInstaller.class, hint = "maven31" )
public class Maven31ArtifactInstaller implements ArtifactInstaller
{
@@ -63,7 +66,7 @@ public class Maven31ArtifactInstaller im
{
if ( metadata instanceof ProjectArtifactMetadata )
{
- org.eclipse.aether.artifact.Artifact pomArtifact = new
SubArtifact( mainArtifact, "", "pom" );
+ Artifact pomArtifact = new SubArtifact( mainArtifact, "",
"pom" );
pomArtifact = pomArtifact.setFile( (
(ProjectArtifactMetadata) metadata ).getFile() );
request.addArtifact( pomArtifact );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManager.java
Sat May 30 14:39:56 2015
@@ -23,8 +23,10 @@ import java.io.File;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
+/**
+ *
+ */
public interface RepositoryManager
{
@@ -37,7 +39,7 @@ public interface RepositoryManager
* @param basedir the base directory of the local repository
* @return a new project building request
*/
- public ProjectBuildingRequest setLocalRepositoryBasedir(
ProjectBuildingRequest request, File basedir );
+ ProjectBuildingRequest setLocalRepositoryBasedir( ProjectBuildingRequest
request, File basedir );
/**
* Get the localRepositryBasedir as specified in the repository session of
the request
@@ -45,5 +47,5 @@ public interface RepositoryManager
* @param request the build request
* @return the local repository base directory
*/
- public File getLocalRepositoryBasedir( ProjectBuildingRequest request );
+ File getLocalRepositoryBasedir( ProjectBuildingRequest request );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/RepositoryManagerException.java
Sat May 30 14:39:56 2015
@@ -19,6 +19,9 @@ package org.apache.maven.shared.artifact
* under the License.
*/
+/**
+ *
+ */
public class RepositoryManagerException extends Exception
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/DefaultRepositoryManager.java
Sat May 30 14:39:56 2015
@@ -32,6 +32,9 @@ import org.codehaus.plexus.context.Conte
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+/**
+ *
+ */
@Component( role = RepositoryManager.class )
public class DefaultRepositoryManager
implements RepositoryManager, Contextualizable
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven302RepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven302RepositoryManager.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven302RepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven302RepositoryManager.java
Sat May 30 14:39:56 2015
@@ -23,6 +23,9 @@ import org.apache.maven.shared.artifact.
import org.codehaus.plexus.component.annotations.Component;
import org.sonatype.aether.repository.LocalRepository;
+/**
+ *
+ */
@Component( role = RepositoryManager.class, hint = "maven302" )
public class Maven302RepositoryManager
extends Maven30RepositoryManager
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManager.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManager.java
Sat May 30 14:39:56 2015
@@ -26,7 +26,6 @@ import org.apache.maven.project.DefaultP
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.repository.RepositoryManager;
import org.apache.maven.shared.artifact.repository.RepositoryManagerException;
-import org.apache.maven.shared.artifact.repository.internal.Invoker;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.aether.RepositorySystem;
@@ -37,6 +36,9 @@ import org.sonatype.aether.repository.Lo
import org.sonatype.aether.util.DefaultRepositoryCache;
import org.sonatype.aether.util.DefaultRepositorySystemSession;
+/**
+ *
+ */
@Component( role = RepositoryManager.class, hint = "maven3" )
public class Maven30RepositoryManager
implements RepositoryManager
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/repository/internal/Maven31RepositoryManager.java
Sat May 30 14:39:56 2015
@@ -36,6 +36,9 @@ import org.eclipse.aether.artifact.Artif
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.LocalRepositoryManager;
+/**
+ *
+ */
@Component( role = RepositoryManager.class, hint = "maven31" )
public class Maven31RepositoryManager
implements RepositoryManager
@@ -53,8 +56,9 @@ public class Maven31RepositoryManager
// LRM.getPathForLocalArtifact() won't throw an Exception, so
translate reflection error to RuntimeException
try
{
- aetherArtifact = (Artifact) Invoker.invoke( RepositoryUtils.class,
"toArtifact", org.apache.maven.artifact.Artifact.class,
- mavenArtifact );
+ aetherArtifact =
+ (Artifact) Invoker.invoke( RepositoryUtils.class, "toArtifact",
+
org.apache.maven.artifact.Artifact.class, mavenArtifact );
session = (RepositorySystemSession) Invoker.invoke(
buildingRequest, "getRepositorySession" );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
Sat May 30 14:39:56 2015
@@ -21,27 +21,27 @@ package org.apache.maven.shared.artifact
import java.util.List;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.resolve.filter.TransformableFilter;
+/**
+ *
+ */
public interface ArtifactResolver
{
- public org.apache.maven.artifact.Artifact resolveArtifact(
ProjectBuildingRequest buildingRequest,
-
org.apache.maven.artifact.Artifact mavenArtifact,
-
List<ArtifactRepository> remoteRepositories )
+ Artifact resolveArtifact( ProjectBuildingRequest buildingRequest, Artifact
mavenArtifact,
+ List<ArtifactRepository> remoteRepositories )
throws ArtifactResolverException;
- public void resolveTransitively( ProjectBuildingRequest buildingRequest,
- org.apache.maven.artifact.Artifact
mavenArtifact,
- List<ArtifactRepository>
remoteRepositories )
+ void resolveTransitively( ProjectBuildingRequest buildingRequest, Artifact
mavenArtifact,
+ List<ArtifactRepository> remoteRepositories )
throws ArtifactResolverException;
-
- public void resolveTransitively( ProjectBuildingRequest buildingRequest,
- org.apache.maven.artifact.Artifact
mavenArtifact,
- List<ArtifactRepository>
remoteRepositories,
- TransformableFilter filter )
+
+ void resolveTransitively( ProjectBuildingRequest buildingRequest, Artifact
mavenArtifact,
+ List<ArtifactRepository> remoteRepositories,
TransformableFilter filter )
throws ArtifactResolverException;
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java
Sat May 30 14:39:56 2015
@@ -19,6 +19,9 @@ package org.apache.maven.shared.artifact
* under the License.
*/
+/**
+ *
+ */
public class ArtifactResolverException extends Exception
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/filter/TransformableFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/filter/TransformableFilter.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/filter/TransformableFilter.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/filter/TransformableFilter.java
Sat May 30 14:39:56 2015
@@ -19,6 +19,9 @@ package org.apache.maven.shared.artifact
* under the License.
*/
+/**
+ *
+ */
public interface TransformableFilter
{
/**
@@ -34,5 +37,5 @@ public interface TransformableFilter
* @param transformer the tool specific transformer
* @return the transformed value
*/
- public abstract <T> T transform( FilterTransformer<T> transformer );
+ <T> T transform( FilterTransformer<T> transformer );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
Sat May 30 14:39:56 2015
@@ -1,21 +1,5 @@
package org.apache.maven.shared.artifact.resolve.internal;
-import java.util.List;
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
-import org.apache.maven.shared.artifact.resolve.filter.TransformableFilter;
-import org.codehaus.plexus.PlexusConstants;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.component.annotations.Component;
-import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -35,15 +19,33 @@ import org.codehaus.plexus.personality.p
* under the License.
*/
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.artifact.resolve.filter.TransformableFilter;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.component.annotations.Component;
+import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+
+/**
+ *
+ */
@Component( role = ArtifactResolver.class, hint = "default" )
public class DefaultArtifactResolver
implements ArtifactResolver, Contextualizable
{
private PlexusContainer container;
- public org.apache.maven.artifact.Artifact resolveArtifact(
ProjectBuildingRequest buildingRequest,
- Artifact
mavenArtifact,
-
List<ArtifactRepository> remoteRepositories )
+ public Artifact resolveArtifact( ProjectBuildingRequest buildingRequest,
Artifact mavenArtifact,
+ List<ArtifactRepository>
remoteRepositories )
throws ArtifactResolverException
{
try
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/EclipseAetherFilterTransformer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/EclipseAetherFilterTransformer.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/EclipseAetherFilterTransformer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/EclipseAetherFilterTransformer.java
Sat May 30 14:39:56 2015
@@ -33,7 +33,8 @@ import org.eclipse.aether.util.filter.Ex
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
import org.eclipse.aether.graph.DependencyFilter;
-class EclipseAetherFilterTransformer implements
FilterTransformer<DependencyFilter>
+class EclipseAetherFilterTransformer
+ implements FilterTransformer<DependencyFilter>
{
public AndDependencyFilter transform( AndFilter andFilter )
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
Sat May 30 14:39:56 2015
@@ -45,6 +45,9 @@ import org.sonatype.aether.resolution.Ar
import org.sonatype.aether.resolution.ArtifactResolutionException;
import org.sonatype.aether.resolution.ArtifactResult;
+/**
+ *
+ */
@Component( role = ArtifactResolver.class, hint = "maven3" )
public class Maven30ArtifactResolver
implements ArtifactResolver
@@ -133,7 +136,7 @@ public class Maven30ArtifactResolver
aetherRepositories );
DependencyFilter depFilter = null;
- if( dependencyFilter != null )
+ if ( dependencyFilter != null )
{
depFilter = dependencyFilter.transform( new
SonatypeAetherFilterTransformer() );
}
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
Sat May 30 14:39:56 2015
@@ -46,6 +46,9 @@ import org.eclipse.aether.resolution.Art
import org.eclipse.aether.resolution.DependencyRequest;
import org.eclipse.aether.resolution.DependencyResolutionException;
+/**
+ *
+ */
@Component( role = ArtifactResolver.class, hint = "maven31" )
public class Maven31ArtifactResolver
implements ArtifactResolver
Modified:
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/SonatypeAetherFilterTransformer.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/SonatypeAetherFilterTransformer.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/SonatypeAetherFilterTransformer.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/main/java/org/apache/maven/shared/artifact/resolve/internal/SonatypeAetherFilterTransformer.java
Sat May 30 14:39:56 2015
@@ -34,7 +34,11 @@ import org.sonatype.aether.util.filter.E
import org.sonatype.aether.util.filter.OrDependencyFilter;
import org.sonatype.aether.util.filter.ScopeDependencyFilter;
-class SonatypeAetherFilterTransformer implements
FilterTransformer<DependencyFilter>
+/**
+ *
+ */
+class SonatypeAetherFilterTransformer
+ implements FilterTransformer<DependencyFilter>
{
public AndDependencyFilter transform( AndFilter filter )
{
Modified:
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java
Sat May 30 14:39:56 2015
@@ -1,5 +1,24 @@
package org.apache.maven.shared.artifact.install.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
+ *
+ * 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.
+ */
+
import java.io.File;
import java.util.Arrays;
import java.util.Collection;
Modified:
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManagerTest.java?rev=1682608&r1=1682607&r2=1682608&view=diff
==============================================================================
---
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManagerTest.java
(original)
+++
maven/shared/trunk/maven-artifact-transfer/src/test/java/org/apache/maven/shared/artifact/repository/internal/Maven30RepositoryManagerTest.java
Sat May 30 14:39:56 2015
@@ -1,5 +1,24 @@
package org.apache.maven.shared.artifact.repository.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
+ *
+ * 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.
+ */
+
import java.io.File;
import org.apache.maven.project.DefaultProjectBuildingRequest;
