http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java index a4cf6df..7b20eb5 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java @@ -29,7 +29,7 @@ import junit.framework.TestCase; /** * Tests {@link ArtifactUtils}. - * + * * @author Benjamin Bentmann */ public class ArtifactUtilsTest
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java index 5eefaa9..0d109ac 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java @@ -26,19 +26,19 @@ import org.codehaus.plexus.PlexusTestCase; public class DefaultArtifactFactoryTest extends PlexusTestCase { - + public void testPropagationOfSystemScopeRegardlessOfInheritedScope() throws Exception { ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE ); - + Artifact artifact = factory.createDependencyArtifact( "test-grp", "test-artifact", VersionRange.createFromVersion("1.0"), "type", null, "system", "provided" ); Artifact artifact2 = factory.createDependencyArtifact( "test-grp", "test-artifact-2", VersionRange.createFromVersion("1.0"), "type", null, "system", "test" ); Artifact artifact3 = factory.createDependencyArtifact( "test-grp", "test-artifact-3", VersionRange.createFromVersion("1.0"), "type", null, "system", "runtime" ); Artifact artifact4 = factory.createDependencyArtifact( "test-grp", "test-artifact-4", VersionRange.createFromVersion("1.0"), "type", null, "system", "compile" ); - + // this one should never happen in practice... Artifact artifact5 = factory.createDependencyArtifact( "test-grp", "test-artifact-5", VersionRange.createFromVersion("1.0"), "type", null, "system", "system" ); - + assertEquals( "system", artifact.getScope() ); assertEquals( "system", artifact2.getScope() ); assertEquals( "system", artifact3.getScope() ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java b/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java index 9418680..f8bb167 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java @@ -37,7 +37,7 @@ public class TestMetadataSource { @Requirement private ArtifactFactory factory; - + public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) throws ArtifactMetadataRetrievalException { @@ -56,7 +56,7 @@ public class TestMetadataSource throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a ); } } - + if ( "i".equals( artifact.getArtifactId() ) ) { Artifact a = null; @@ -70,7 +70,7 @@ public class TestMetadataSource throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a ); } } - + return new ResolutionGroup( artifact, dependencies, remoteRepositories ); } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java index ca9ef2a..533f304 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/repository/MavenArtifactRepositoryTest.java @@ -28,7 +28,7 @@ public class MavenArtifactRepositoryTest private static class MavenArtifactRepositorySubclass extends MavenArtifactRepository { String id; - + public MavenArtifactRepositorySubclass(String id) { this.id = id; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java index 39c99c9..aeacfb8 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java @@ -26,7 +26,7 @@ import junit.framework.TestCase; /** * Test the artifact resolution exception message - * + * * @author Mauro Talevi */ public class ArtifactResolutionExceptionTest http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java index 5ab0d58..117c0e2 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java @@ -63,7 +63,7 @@ public class ArtifactResolverTest projectArtifact = createLocalArtifact( "project", "3.0" ); } - + @Override protected void tearDown() throws Exception http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java index b9f4d19..c78c190 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestFileWagon.java @@ -30,7 +30,7 @@ import org.apache.maven.wagon.providers.file.FileWagon; import org.apache.maven.wagon.resource.Resource; /** - * Wagon used for test cases that annotates some methods. Note that this is not a thread-safe implementation. + * Wagon used for test cases that annotates some methods. Note that this is not a thread-safe implementation. */ public class TestFileWagon extends FileWagon @@ -38,10 +38,10 @@ public class TestFileWagon private TestTransferListener testTransferListener; private boolean insideGet; - protected void getTransfer( Resource resource, - File destination, - InputStream input, - boolean closeInput, + protected void getTransfer( Resource resource, + File destination, + InputStream input, + boolean closeInput, int maxSize ) throws TransferFailedException { @@ -50,16 +50,16 @@ public class TestFileWagon } public void get( String resourceName, File destination ) - throws TransferFailedException, - ResourceDoesNotExistException, + throws TransferFailedException, + ResourceDoesNotExistException, AuthorizationException { addTransfer( "get " + resourceName ); - + insideGet = true; - + super.get( resourceName, destination ); - + insideGet = false; } @@ -72,8 +72,8 @@ public class TestFileWagon } public boolean getIfNewer( String resourceName, File destination, long timestamp ) - throws TransferFailedException, - ResourceDoesNotExistException, + throws TransferFailedException, + ResourceDoesNotExistException, AuthorizationException { if ( !insideGet ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java index 27d96bd..bca112b 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; /** * Tests {@link AndArtifactFilter}. - * + * * @author Benjamin Bentmann */ public class AndArtifactFilterTest http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java index 9dfb373..fb46566 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/FilterHashEqualsTest.java @@ -42,7 +42,7 @@ public class FilterHashEqualsTest assertTrue( f1.equals(f2) ); assertTrue( f2.equals(f1) ); assertTrue( f1.hashCode() == f2.hashCode() ); - + IncludesArtifactFilter f3 = new IncludesArtifactFilter( Arrays.asList( "d", "c", "e" ) ); assertTrue( f1.equals( f3 ) ); assertTrue( f1.hashCode() == f3.hashCode() ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java index e17c0d4..e161437 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; /** * Tests {@link OrArtifactFilter}. - * + * * @author Benjamin Bentmann */ public class OrArtifactFilterTest http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java index d50750a..1a65eca 100644 --- a/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java +++ b/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilterTest.java @@ -26,7 +26,7 @@ import junit.framework.TestCase; /** * Tests {@link ScopeArtifactFilter}. - * + * * @author Benjamin Bentmann */ public class ScopeArtifactFilterTest http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java index 8f01977..8e3b86a 100644 --- a/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java +++ b/maven-compat/src/test/java/org/apache/maven/profiles/manager/DefaultProfileManagerTest.java @@ -111,7 +111,7 @@ public class DefaultProfileManagerTest assertEquals( 1, active.size() ); assertEquals( "syspropActivated", ( (Profile) active.get( 0 ) ).getId() ); } - + public void testShouldNotActivateReversalOfPresentSystemProperty() throws Exception http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java index 71f79a4..7e3f7e6 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java +++ b/maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java @@ -6,9 +6,9 @@ package org.apache.maven.project; * 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 @@ -55,7 +55,7 @@ public abstract class AbstractMavenProjectTestCase throws Exception { super.setUp(); - + if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) ) { projectBuilder = lookup( ProjectBuilder.class, "test" ); @@ -65,9 +65,9 @@ public abstract class AbstractMavenProjectTestCase // default over to the main project builder... projectBuilder = lookup( ProjectBuilder.class ); } - - repositorySystem = lookup( RepositorySystem.class ); - } + + repositorySystem = lookup( RepositorySystem.class ); + } @Override protected void tearDown() http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java index d5ab60e..024917d 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java +++ b/maven-compat/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java @@ -35,7 +35,7 @@ import org.apache.maven.plugin.MojoExecution; /** * A stub implementation that assumes an empty lifecycle to bypass interaction with the plugin manager and to avoid * plugin artifact resolution from repositories. - * + * * @author Benjamin Bentmann */ public class EmptyLifecycleExecutor http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/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 f696675..d9e7beb 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 @@ -45,9 +45,9 @@ public class ProjectClasspathTest // the metadata source looks up the default impl, so we have to trick it getContainer().addComponent( projectBuilder, ProjectBuilder.class, "default" ); - repositorySystem = lookup( RepositorySystem.class ); + repositorySystem = lookup( RepositorySystem.class ); } - + @Override protected String getCustomConfigurationName() { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java b/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java index c02171f..754487f 100644 --- a/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java +++ b/maven-compat/src/test/java/org/apache/maven/project/TestProjectBuilder.java @@ -26,16 +26,16 @@ import org.codehaus.plexus.component.annotations.Component; @Component(role=ProjectBuilder.class,hint="classpath") public class TestProjectBuilder extends DefaultProjectBuilder -{ - +{ + @Override public ProjectBuildingResult build( Artifact artifact, ProjectBuildingRequest request ) throws ProjectBuildingException - { + { if ( "maven-test".equals( artifact.getGroupId() ) ) { String scope = artifact.getArtifactId().substring( "scope-".length() ); - + try { artifact.setFile( ProjectClasspathTest.getFileForClasspathResource( ProjectClasspathTest.dir + "transitive-" + scope + "-dep.xml" ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/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 1e40631..339c81f 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 @@ -63,16 +63,16 @@ public class ProjectInheritanceTest throws Exception { File localRepo = getLocalRepositoryPath(); - + System.out.println( "Local repository is at: " + localRepo.getAbsolutePath() ); - + File pom0 = new File( localRepo, "p0/pom.xml" ); File pom1 = new File( pom0.getParentFile(), "p1/pom.xml" ); File pom2 = new File( pom1.getParentFile(), "p2/pom.xml" ); File pom3 = new File( pom2.getParentFile(), "p3/pom.xml" ); File pom4 = new File( pom3.getParentFile(), "p4/pom.xml" ); File pom5 = new File( pom4.getParentFile(), "p5/pom.xml" ); - + System.out.println( "Location of project-4's POM: " + pom4.getPath() ); // load everything... @@ -114,22 +114,22 @@ public class ProjectInheritanceTest // ---------------------------------------------------------------------- assertEquals( "4.0.0", project4.getModelVersion() ); - + Build build = project4.getBuild(); List<Plugin> plugins = build.getPlugins(); - + Map validPluginCounts = new HashMap(); - + String testPluginArtifactId = "maven-compiler-plugin"; - + // this is the plugin we're looking for. validPluginCounts.put( testPluginArtifactId, 0 ); - + // these are injected if -DperformRelease=true validPluginCounts.put( "maven-deploy-plugin", 0 ); validPluginCounts.put( "maven-javadoc-plugin", 0 ); validPluginCounts.put( "maven-source-plugin", 0 ); - + Plugin testPlugin = null; for ( Plugin plugin : plugins ) @@ -161,9 +161,9 @@ public class ProjectInheritanceTest } } } - + List executions = testPlugin.getExecutions(); - + assertEquals( 1, executions.size() ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java index ba6a4a6..fb32f0f 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java @@ -1,24 +1,24 @@ package org.apache.maven.repository; -/* - * 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. - */ - +/* + * 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 org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.codehaus.plexus.PlexusTestCase; http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java index d7d196e..77a6bae 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java @@ -39,7 +39,7 @@ public class LegacyRepositoryLayout { return "legacy"; } - + public String pathOf( Artifact artifact ) { ArtifactHandler artifactHandler = artifact.getArtifactHandler(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java index 9dc7cc0..96af590 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java @@ -6,9 +6,9 @@ package org.apache.maven.repository; * 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 @@ -41,7 +41,7 @@ import org.eclipse.aether.repository.LocalRepository; /** * Tests {@link LegacyRepositorySystem}. - * + * * @author Benjamin Bentmann */ public class LegacyRepositorySystemTest @@ -76,7 +76,7 @@ public class LegacyRepositorySystemTest resolutionErrorHandler = null; super.tearDown(); } - + protected List<ArtifactRepository> getRemoteRepositories() throws Exception { @@ -116,14 +116,14 @@ public class LegacyRepositorySystemTest d.setVersion( "0.1" ); d.setScope( Artifact.SCOPE_COMPILE ); Artifact artifact = repositorySystem.createDependencyArtifact( d ); - + ArtifactResolutionRequest request = new ArtifactResolutionRequest() .setArtifact( artifact ) .setResolveRoot( true ) .setResolveTransitively( true ) .setRemoteRepositories( getRemoteRepositories() ) - .setLocalRepository( getLocalRepository() ); - + .setLocalRepository( getLocalRepository() ); + DefaultRepositorySystemSession session = new DefaultRepositorySystemSession(); LocalRepository localRepo = new LocalRepository( request.getLocalRepository().getBasedir() ); session.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( session, localRepo ) ); @@ -132,19 +132,19 @@ public class LegacyRepositorySystemTest new DefaultMavenExecutionResult() ) ); ArtifactResolutionResult result = repositorySystem.resolve( request ); - resolutionErrorHandler.throwErrors( request, result ); + resolutionErrorHandler.throwErrors( request, result ); assertEquals( 2, result.getArtifacts().size() ); - + + // + // System scoped version which should // - // System scoped version which should - // d.setScope( Artifact.SCOPE_SYSTEM ); File file = new File( getBasedir(), "src/test/repository-system/maven-core-2.1.0.jar" ); assertTrue( file.exists() ); d.setSystemPath( file.getCanonicalPath() ); - + artifact = repositorySystem.createDependencyArtifact( d ); - + // // The request has not set any local or remote repositories as the system scoped dependency being resolved should only // give us the dependency off the disk and nothing more. @@ -153,19 +153,19 @@ public class LegacyRepositorySystemTest .setArtifact( artifact ) .setResolveRoot( true ) .setResolveTransitively( true ); - + result = repositorySystem.resolve( request ); - resolutionErrorHandler.throwErrors( request, result ); - assertEquals( 1, result.getArtifacts().size() ); + resolutionErrorHandler.throwErrors( request, result ); + assertEquals( 1, result.getArtifacts().size() ); // // Put in a bogus file to make sure missing files cause the resolution to fail. - // + // file = new File( getBasedir(), "src/test/repository-system/maven-monkey-2.1.0.jar" ); assertFalse( file.exists() ); d.setSystemPath( file.getCanonicalPath() ); artifact = repositorySystem.createDependencyArtifact( d ); - + // // The request has not set any local or remote repositories as the system scoped dependency being resolved should only // give us the dependency off the disk and nothing more. @@ -174,7 +174,7 @@ public class LegacyRepositorySystemTest .setArtifact( artifact ) .setResolveRoot( true ) .setResolveTransitively( true ); - + try { result = repositorySystem.resolve( request ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java index c5ec6f6..1c5f34c 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java @@ -59,7 +59,7 @@ public class DefaultUpdateCheckManagerTest ArtifactRepository localRepository = localRepository(); Artifact a = createArtifact( "a", "0.0.1-SNAPSHOT" ); - File file = new File( localRepository.getBasedir(), + File file = new File( localRepository.getBasedir(), localRepository.pathOf( a ) ); file.delete(); a.setFile( file ); @@ -77,7 +77,7 @@ public class DefaultUpdateCheckManagerTest assertNull( updateCheckManager.readLastUpdated( touchFile, updateCheckManager.getRepositoryKey( remoteRepository ) ) ); - + assertFalse( updateCheckManager.getTouchfile( a ).exists() ); } @@ -89,7 +89,7 @@ public class DefaultUpdateCheckManagerTest ArtifactRepository localRepository = localRepository(); Artifact a = createArtifact( "a", "0.0.1-SNAPSHOT" ); - File file = new File( localRepository.getBasedir(), + File file = new File( localRepository.getBasedir(), localRepository.pathOf( a ) ); file.delete(); a.setFile( file ); @@ -115,7 +115,7 @@ public class DefaultUpdateCheckManagerTest ArtifactRepository localRepository = localRepository(); Artifact a = createArtifact( "a", "0.0.1", "pom" ); - File file = new File( localRepository.getBasedir(), + File file = new File( localRepository.getBasedir(), localRepository.pathOf( a ) ); file.delete(); a.setFile( file ); @@ -133,7 +133,7 @@ public class DefaultUpdateCheckManagerTest assertNull( updateCheckManager.readLastUpdated( touchFile, updateCheckManager.getRepositoryKey( remoteRepository ) ) ); - + assertFalse( updateCheckManager.getTouchfile( a ).exists() ); } @@ -145,7 +145,7 @@ public class DefaultUpdateCheckManagerTest ArtifactRepository localRepository = localRepository(); Artifact a = createArtifact( "a", "0.0.1", "pom" ); - File file = new File( localRepository.getBasedir(), + File file = new File( localRepository.getBasedir(), localRepository.pathOf( a ) ); file.delete(); a.setFile( file ); @@ -223,14 +223,14 @@ public class DefaultUpdateCheckManagerTest ArtifactRepository localRepository = localRepository(); Artifact a = artifactFactory.createArtifactWithClassifier( "groupdId", "a", "0.0.1-SNAPSHOT", "jar", null ); - File file = new File( localRepository.getBasedir(), + File file = new File( localRepository.getBasedir(), localRepository.pathOf( a ) ); a.setFile( file ); assertEquals( "a-0.0.1-SNAPSHOT.jar.lastUpdated", updateCheckManager.getTouchfile( a ).getName() ); a = artifactFactory.createArtifactWithClassifier( "groupdId", "a", "0.0.1-SNAPSHOT", "jar", "classifier" ); - file = new File( localRepository.getBasedir(), + file = new File( localRepository.getBasedir(), localRepository.pathOf( a ) ); a.setFile( file ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java index 01ab3b9..f34c05f 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java @@ -6,9 +6,9 @@ package org.apache.maven.repository.legacy; * 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 @@ -28,7 +28,7 @@ import org.codehaus.plexus.PlexusTestCase; /** * Tests {@link LegacyRepositorySystem}. - * + * * @author Benjamin Bentmann */ public class LegacyRepositorySystemTest http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java index f5f561e..d0325db 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java @@ -42,7 +42,7 @@ public class StringWagon extends StreamWagon { private Map<String, String> expectedContent = new HashMap<String, String>(); - + public void addExpectedContent( String resourceName, String expectedContent ) { this.expectedContent.put( resourceName, expectedContent ); @@ -66,7 +66,7 @@ public class StringWagon Resource resource = inputData.getResource(); String content = expectedContent.get( resource.getName() ); - + if ( content != null ) { resource.setContentLength( content.length() ); @@ -102,6 +102,6 @@ public class StringWagon public void clearExpectedContent() { - expectedContent.clear(); + expectedContent.clear(); } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java index ddfa8bb..601eefa 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java @@ -24,7 +24,7 @@ import org.codehaus.plexus.component.annotations.Component; /** * Wagon for testing, for protocol <code>a</code> - * + * * @author <a href="mailto:[email protected]";>Carlos Sanchez</a> * @author <a href="mailto:[email protected]";>Jason van Zyl</a> */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java index 581bcad..ecaef64 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java @@ -24,7 +24,7 @@ import org.codehaus.plexus.component.annotations.Component; /** * Wagon for testing, for protocols <code>b1</code> and <code>b2</code> - * + * * @author <a href="mailto:[email protected]";>Carlos Sanchez</a> * @author <a href="mailto:[email protected]";>Jason van Zyl</a> */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java index 2908eee..29316ed 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java @@ -24,7 +24,7 @@ import org.codehaus.plexus.component.annotations.Component; /** * Wagon for testing, for protocol <code>c</code> - * + * * @author <a href="mailto:[email protected]";>Carlos Sanchez</a> * @author <a href="mailto:[email protected]";>Jason van Zyl</a> */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java index 9a28b9b..c516360 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java @@ -23,7 +23,7 @@ import org.apache.maven.wagon.providers.file.FileWagon; /** * Mock of a Wagon for testing - * + * * @author <a href="mailto:[email protected]";>Carlos Sanchez</a> */ public class WagonMock http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java index b02dacd..bfab0d2 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java @@ -36,11 +36,11 @@ public abstract class AbstractConflictResolverTest extends PlexusTestCase { // constants -------------------------------------------------------------- - + private static final String GROUP_ID = "test"; - + // fields ----------------------------------------------------------------- - + protected Artifact a1; protected Artifact a2; @@ -48,21 +48,21 @@ public abstract class AbstractConflictResolverTest protected Artifact b1; private final String roleHint; - + private ArtifactFactory artifactFactory; private ConflictResolver conflictResolver; - + // constructors ----------------------------------------------------------- - + public AbstractConflictResolverTest( String roleHint ) throws Exception { this.roleHint = roleHint; } - + // TestCase methods ------------------------------------------------------- - + /* * @see junit.framework.TestCase#setUp() */ @@ -72,12 +72,12 @@ public abstract class AbstractConflictResolverTest artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE ); conflictResolver = (ConflictResolver) lookup( ConflictResolver.ROLE, roleHint ); - + a1 = createArtifact( "a", "1.0" ); a2 = createArtifact( "a", "2.0" ); b1 = createArtifact( "b", "1.0" ); } - + /* * @see org.codehaus.plexus.PlexusTestCase#tearDown() */ @@ -86,24 +86,24 @@ public abstract class AbstractConflictResolverTest a1 = null; a2 = null; b1 = null; - + artifactFactory = null; conflictResolver = null; - + super.tearDown(); } - + // protected methods ------------------------------------------------------ - + protected ConflictResolver getConflictResolver() { return conflictResolver; } - + protected void assertResolveConflict( ResolutionNode expectedNode, ResolutionNode actualNode1, ResolutionNode actualNode2 ) { ResolutionNode resolvedNode = getConflictResolver().resolveConflict( actualNode1, actualNode2 ); - + assertNotNull( "Expected resolvable", resolvedNode ); assertEquals( "Resolution node", expectedNode, resolvedNode ); } @@ -111,7 +111,7 @@ public abstract class AbstractConflictResolverTest protected void assertUnresolvableConflict( ResolutionNode actualNode1, ResolutionNode actualNode2 ) { ResolutionNode resolvedNode = getConflictResolver().resolveConflict( actualNode1, actualNode2 ); - + assertNull( "Expected unresolvable", resolvedNode ); } @@ -136,7 +136,7 @@ public abstract class AbstractConflictResolverTest throws InvalidVersionSpecificationException { VersionRange versionRange = VersionRange.createFromVersionSpec( version ); - + return artifactFactory.createDependencyArtifact( GROUP_ID, id, versionRange, "jar", null, scope, inheritedScope, optional ); } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java index d4a48ad..96e283d 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java @@ -34,13 +34,13 @@ public class FarthestConflictResolverTest extends AbstractConflictResolverTest { // constructors ----------------------------------------------------------- - + public FarthestConflictResolverTest() throws Exception { super("farthest"); } - + // tests ------------------------------------------------------------------ /** @@ -55,7 +55,7 @@ public class FarthestConflictResolverTest ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n ); - + assertResolveConflict( a2n, a1n, a2n ); } @@ -71,7 +71,7 @@ public class FarthestConflictResolverTest ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n ); ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); - + assertResolveConflict( a2n, a2n, a1n ); } @@ -86,7 +86,7 @@ public class FarthestConflictResolverTest { ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST ); - + assertResolveConflict( a1n, a1n, a2n ); } @@ -101,7 +101,7 @@ public class FarthestConflictResolverTest { ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST ); ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); - + assertResolveConflict( a2n, a2n, a1n ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java index cdf1812..0c7b035 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java @@ -34,13 +34,13 @@ public class NearestConflictResolverTest extends AbstractConflictResolverTest { // constructors ----------------------------------------------------------- - + public NearestConflictResolverTest() throws Exception { super("nearest"); } - + // tests ------------------------------------------------------------------ /** @@ -55,7 +55,7 @@ public class NearestConflictResolverTest ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n ); - + assertResolveConflict( a1n, a1n, a2n ); } @@ -71,7 +71,7 @@ public class NearestConflictResolverTest ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n ); ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); - + assertResolveConflict( a1n, a2n, a1n ); } @@ -86,7 +86,7 @@ public class NearestConflictResolverTest { ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST ); - + assertResolveConflict( a1n, a1n, a2n ); } @@ -101,7 +101,7 @@ public class NearestConflictResolverTest { ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST ); ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); - + assertResolveConflict( a2n, a2n, a1n ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java index bea73db..68d19d6 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java @@ -34,13 +34,13 @@ public class NewestConflictResolverTest extends AbstractConflictResolverTest { // constructors ----------------------------------------------------------- - + public NewestConflictResolverTest() throws Exception { super("newest"); } - + // tests ------------------------------------------------------------------ /** @@ -55,7 +55,7 @@ public class NewestConflictResolverTest ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n ); - + assertResolveConflict( a2n, a1n, a2n ); } @@ -71,7 +71,7 @@ public class NewestConflictResolverTest ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n ); ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); - + assertResolveConflict( a2n, a2n, a1n ); } @@ -86,7 +86,7 @@ public class NewestConflictResolverTest { ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST ); - + assertResolveConflict( a2n, a1n, a2n ); } @@ -101,7 +101,7 @@ public class NewestConflictResolverTest { ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST ); ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); - + assertResolveConflict( a2n, a2n, a1n ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java index bf2b003..6b06d34 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java @@ -34,13 +34,13 @@ public class OldestConflictResolverTest extends AbstractConflictResolverTest { // constructors ----------------------------------------------------------- - + public OldestConflictResolverTest() throws Exception { super("oldest"); } - + // tests ------------------------------------------------------------------ /** @@ -55,7 +55,7 @@ public class OldestConflictResolverTest ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n ); - + assertResolveConflict( a1n, a1n, a2n ); } @@ -71,7 +71,7 @@ public class OldestConflictResolverTest ResolutionNode b1n = new ResolutionNode( b1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST, b1n ); ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); - + assertResolveConflict( a1n, a2n, a1n ); } @@ -86,7 +86,7 @@ public class OldestConflictResolverTest { ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST ); - + assertResolveConflict( a1n, a1n, a2n ); } @@ -101,7 +101,7 @@ public class OldestConflictResolverTest { ResolutionNode a2n = new ResolutionNode( a2, Collections.EMPTY_LIST ); ResolutionNode a1n = new ResolutionNode( a1, Collections.EMPTY_LIST ); - + assertResolveConflict( a1n, a2n, a1n ); } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java index e4edb3c..4f40516 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java @@ -27,7 +27,7 @@ import org.codehaus.plexus.PlexusTestCase; /** * * @author <a href="mailto:[email protected]";>Oleg Gusakov</a> - * + * */ public class DefaultClasspathTransformationTest @@ -53,7 +53,7 @@ extends PlexusTestCase * v2 * v1< * v3-v4 - * + * */ v1 = graph.addVertex(new ArtifactMetadata("g","a1","1.0")); graph.setEntry(v1); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java index 990e1b8..31832c3 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java @@ -22,7 +22,7 @@ import org.codehaus.plexus.PlexusTestCase; /** * * @author <a href="mailto:[email protected]";>Oleg Gusakov</a> - * + * */ public class DefaultGraphConflictResolutionPolicyTest http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java index d195567..4fba8f5 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java @@ -27,7 +27,7 @@ import org.codehaus.plexus.logging.Logger; /** * * @author <a href="mailto:[email protected]";>Oleg Gusakov</a> - * + * */ public class DefaultGraphConflictResolverTest @@ -54,7 +54,7 @@ extends PlexusTestCase * v2 * v1< * v3-v4 - * + * */ graph = new MetadataGraph( 4, 3 ); v1 = graph.addVertex(new ArtifactMetadata("g","a1","1.0")); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java b/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java index 15a247e..dd9a900 100644 --- a/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java +++ b/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java @@ -40,7 +40,7 @@ public class TestMetadataSource { @Requirement private ArtifactFactory factory; - + public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) throws ArtifactMetadataRetrievalException { @@ -59,7 +59,7 @@ public class TestMetadataSource throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a ); } } - + if ( "i".equals( artifact.getArtifactId() ) ) { Artifact a = null; @@ -73,7 +73,7 @@ public class TestMetadataSource throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a ); } } - + return new ResolutionGroup( artifact, dependencies, remoteRepositories ); } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml index c979956..15115cb 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml @@ -7,7 +7,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>p1</artifactId> <packaging>jar</packaging> - + <build> <plugins> <plugin> @@ -16,7 +16,7 @@ <executions> <execution> <id>normal</id> - + <goals> <goal>compile</goal> </goals> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml index 5435661..4f2e642 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t12/p0/pom.xml @@ -4,7 +4,7 @@ <artifactId>p0</artifactId> <packaging>pom</packaging> <version>1.0</version> - + <build> <plugins> <plugin> @@ -13,10 +13,10 @@ <executions> <execution> <id>test</id> - + <!-- The key to this test... --> <inherited>false</inherited> - + <goals> <goal>compile</goal> </goals> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml index e9ddf0d..736b515 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/modules/p1/pom.xml @@ -7,5 +7,5 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>p1</artifactId> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml ---------------------------------------------------------------------- diff --git a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml index 97bf7cc..a22df68 100644 --- a/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml +++ b/maven-compat/src/test/resources/inheritance-repo/t12scm/p0/pom.xml @@ -4,13 +4,13 @@ <artifactId>p0</artifactId> <packaging>pom</packaging> <version>1.0</version> - + <scm> <connection>scm:svn:http://host/p0</connection> <developerConnection>scm:svn:https://host/p0</developerConnection> <url>http://host/viewer?path=/p0</url> </scm> - + <modules> <module>modules/p1</module> </modules> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/lifecycle-executor.txt ---------------------------------------------------------------------- diff --git a/maven-core/lifecycle-executor.txt b/maven-core/lifecycle-executor.txt index 13ac545..41e98bf 100644 --- a/maven-core/lifecycle-executor.txt +++ b/maven-core/lifecycle-executor.txt @@ -36,7 +36,7 @@ We need to turn this list of phases into a set of plugin objects that have an xm . . </plugins> - + We need this form so that the model builder can make the first pass at merging. Full merging cannot be done because we don't know what the version of the plugin is yet that the user has requested. For plugins in the default lifecycle they are typically defined in the plugin management section of the parent POM. When the merging is complete we are going to have something that looks like the following: <plugins> @@ -57,11 +57,11 @@ We need this form so that the model builder can make the first pass at merging. . </plugins> -Once we have the version of the plugins the appropriate call to the plugin manager can be made to get the MojoDescriptor for the goal that needs to be run. In the MojoDescriptor we are interested in the <configuration/> element and <parameters/> element. From these elements we need to make a component configuration for the MojoExecution. The actual DOM like structure we create is of type PlexusConfiguration and is the type we use with the ComponentConfigurator to initialize fields in a Plexus component. Typically this is done within Plexus with the configuration supplied with component configuration, but in Maven we take configuration values from the POM. So we have to use the ComponentConfigurator outside of Plexus in order to configurure the Maven Mojo which is just a Plexus component. We can use the information from the MojoDescriptor along with the merged configuration information that is now present in the POM to create the complete PlexusConfiguration used to populate values i n the Maven Mojo. +Once we have the version of the plugins the appropriate call to the plugin manager can be made to get the MojoDescriptor for the goal that needs to be run. In the MojoDescriptor we are interested in the <configuration/> element and <parameters/> element. From these elements we need to make a component configuration for the MojoExecution. The actual DOM like structure we create is of type PlexusConfiguration and is the type we use with the ComponentConfigurator to initialize fields in a Plexus component. Typically this is done within Plexus with the configuration supplied with component configuration, but in Maven we take configuration values from the POM. So we have to use the ComponentConfigurator outside of Plexus in order to configurure the Maven Mojo which is just a Plexus component. We can use the information from the MojoDescriptor along with the merged configuration information that is now present in the POM to create the complete PlexusConfiguration used to populate values i n the Maven Mojo. foreach configuration element: - if read only and being set squawk - + - find the parameter - get value from expression or default - if required and null squawk http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/plugin-manager.txt ---------------------------------------------------------------------- diff --git a/maven-core/plugin-manager.txt b/maven-core/plugin-manager.txt index 43cccd3..f3fcf8e 100644 --- a/maven-core/plugin-manager.txt +++ b/maven-core/plugin-manager.txt @@ -47,50 +47,50 @@ i'l // - plugins with a dependency the same as the core but different versions, make it fail then fix it /* - * + * * h2. Concerns for the plugin manager - * + * * h3. resolving the dependencies of a plugin - these could be resolved remotely at runtime or, - * they could be resolved from a local repository - i think we need a simple dependency model here * that is more mercury related and not Maven related i.e no POMs - workspace resolver - we need * tools to pre-populate this repository - * + * * h3. create an isolated classloader - * + * * h3. lookup the plugin with a configuration - * + * * h3. execute the plugin - * + * * h3. plugins may have to deal with particular actions when a plugin is - installed - loaded - * unloaded - update - uninstalled - * + * * h3. plugins should be able to have specific metadata for a plugin model and that be translated - * dependencies - resources - configuration - extension points of plugins - * + * * For a particular application plugin there will be a declarative descriptor for that plugin type. - * + * * - nexus - the plugin class - UI to contribute - what JS to hook into the UI - what resources to * load into the UI - having packed or unpacked plugins, and positioning resources if necessary - * maven can work out of the classloader, nexus plugins probably couldn't given the js and image * resources - * + * * We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be * able to do - * + * * - now what is really the difference between this and loading a component in plexus - custom * classloading capability - remote resolution of dependencies - do we want a model for sharing * information among plugins, is this more like an extension point - do we need a sort of bus for * application data - do we need a dictionary for our applications like Apple does. We could easily * hook into this and this is the model we need to follow - how many of our REST services do not map * directory to a method in the application interface? - * + * * - research extension points versus plugins - * + * * from igor: two plugins A and B, both depend on the same library but use different versions, say * lib 1.0 and lib 2.0 when debugger hits a breakpoint inside a class from the library, IDE needs to * know which version of library the class comes from */ - + This document outlines the concerns of a general plugin manager that would be used in conjunction with any Plexus-based application. The following outlined concerns are an attempt to describe what a plugin manager would need to do for Maven and for Nexus. h2. Concerns for the plugin manager @@ -144,8 +144,8 @@ Each application will have its own model for plugins. Much of this model will be * Configuration metadata and default configuration values * Extension points that plugins might expose -h3. The plugin manager may have to deal with particular actions when a plugin is - +h3. The plugin manager may have to deal with particular actions when a plugin is + * installation * activation * update @@ -158,7 +158,7 @@ We might want to separate between installation and activation, it might be nice These particular phases in a pluginâs lifecycle can probably be generalized to all plugins so could be something implemented in all plugins. Here we could have the descriptor either point to methods for each of these phases to execute or we could create a lifecycle in Plexus for these phases. -For a particular application plugin there will be a declarative descriptor for that plugin type. +For a particular application plugin there will be a declarative descriptor for that plugin type. h3. Some general notes on Nexus @@ -168,11 +168,11 @@ The plugin metadata: * what JS to hook into the UI * what resources to load into the UI * having packed or unpacked plugins, and positioning resources if necessary -* maven can work out of the classloader, nexus plugins probably couldn't given the js and image resources - +* maven can work out of the classloader, nexus plugins probably couldn't given the js and image resources + h3. Other issues -We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be able to do +We need to look at Maven, and Nexus as use cases and figure out what each of them needs to be able to do * now what is really the difference between this and loading a component in plexus * do we want a model for sharing information among plugins, is this more like an extension point @@ -182,4 +182,3 @@ We need to look at Maven, and Nexus as use cases and figure out what each of the - an example of adding js - an example of adding a URI - \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java index 03db5e6..84b5298 100644 --- a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java +++ b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java @@ -69,7 +69,7 @@ public abstract class AbstractMavenLifecycleParticipant * code. */ public void afterSessionEnd( MavenSession session ) - throws MavenExecutionException + throws MavenExecutionException { // do nothing } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java index da88508..dda35bd 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java @@ -38,7 +38,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti * @todo this should probably be a component with some dynamic control of filtering */ @Component( role = ArtifactFilterManager.class ) -public class DefaultArtifactFilterManager +public class DefaultArtifactFilterManager implements ArtifactFilterManager { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/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 fb70bfe..8fc35e8 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -145,7 +145,7 @@ public class DefaultMaven @Requirement private SessionScope sessionScope; - + public MavenExecutionResult execute( MavenExecutionRequest request ) { MavenExecutionResult result; @@ -176,7 +176,7 @@ public class DefaultMaven return result; } - // + // // 1) Setup initial properties. // // 2) Validate local repository directory is accessible. @@ -208,7 +208,7 @@ public class DefaultMaven private MavenExecutionResult doExecute( MavenExecutionRequest request ) { request.setStartTime( new Date() ); - + MavenExecutionResult result = new DefaultMavenExecutionResult(); try @@ -223,14 +223,14 @@ public class DefaultMaven DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) newRepositorySession( request ); MavenSession session = new MavenSession( container, repoSession, request, result ); - + // // We enter the session scope right after the MavenSession creation and before any of the AbstractLifecycleParticipant lookups // so that @SessionScoped components can be @Injected into AbstractLifecycleParticipants. - // + // sessionScope.enter(); sessionScope.seed( MavenSession.class, session ); - + legacySupport.setSession( session ); try @@ -285,7 +285,7 @@ public class DefaultMaven { return addExceptionToResult( result, e ); } - + WorkspaceReader reactorWorkspace; try { @@ -295,14 +295,14 @@ public class DefaultMaven { return addExceptionToResult( result, e ); } - + // // Desired order of precedence for local artifact repositories // // Reactor // Workspace // User Local Repository - // + // repoSession.setWorkspaceReader( ChainedWorkspaceReader.newInstance( reactorWorkspace, repoSession.getWorkspaceReader() ) ); @@ -380,7 +380,7 @@ public class DefaultMaven return result; } - private void afterSessionEnd( Collection<MavenProject> projects, MavenSession session ) + private void afterSessionEnd( Collection<MavenProject> projects, MavenSession session ) throws MavenExecutionException { ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); @@ -641,7 +641,7 @@ public class DefaultMaven throws ProjectBuildingException { MavenExecutionRequest request = session.getRequest(); - + request.getProjectBuildingRequest().setRepositorySession( session.getRepositorySession() ); List<MavenProject> projects = new ArrayList<MavenProject>(); @@ -761,7 +761,7 @@ public class DefaultMaven for ( MavenProject project : projects ) { - // MNG-1911 / MNG-5572: Building plugins with extensions cannot be part of reactor + // MNG-1911 / MNG-5572: Building plugins with extensions cannot be part of reactor for ( Plugin plugin : project.getBuildPlugins() ) { if ( plugin.isExtensions() ) @@ -940,7 +940,7 @@ public class DefaultMaven return result; } - + private List<MavenProject> trimExcludedProjects( List<MavenProject> projects, MavenExecutionRequest request ) throws MavenExecutionException { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java b/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java index c58749d..b139872 100644 --- a/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java +++ b/maven-core/src/main/java/org/apache/maven/DuplicateProjectException.java @@ -26,7 +26,7 @@ import java.util.Map; /** * Signals a collision of two or more projects with the same g:a:v during a reactor build. - * + * * @author Benjamin Bentmann */ public class DuplicateProjectException @@ -37,7 +37,7 @@ public class DuplicateProjectException /** * Creates a new exception with specified details. - * + * * @param message The message text, may be {@code null}. * @param collisions The POM files of the projects that collided, indexed by their g:a:v, may be {@code null}. */ @@ -50,7 +50,7 @@ public class DuplicateProjectException /** * Gets the POM files of the projects that collided. - * + * * @return The POM files of the projects that collided, indexed by their g:a:v, never {@code null}. */ public Map<String, List<File>> getCollisions() http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java index 8d748c9..e5db6bd 100644 --- a/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java +++ b/maven-core/src/main/java/org/apache/maven/FilteredProjectDependencyGraph.java @@ -30,7 +30,7 @@ import org.apache.maven.project.MavenProject; /** * Provides a sub view of another dependency graph. - * + * * @author Benjamin Bentmann */ class FilteredProjectDependencyGraph @@ -45,7 +45,7 @@ class FilteredProjectDependencyGraph /** * Creates a new project dependency graph from the specified graph. - * + * * @param projectDependencyGraph The project dependency graph to create a sub view from, must not be {@code null}. * @param whiteList The projects on which the dependency view should focus, must not be {@code null}. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/InternalErrorException.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/InternalErrorException.java b/maven-core/src/main/java/org/apache/maven/InternalErrorException.java index 1fd7a78..afe92c1 100644 --- a/maven-core/src/main/java/org/apache/maven/InternalErrorException.java +++ b/maven-core/src/main/java/org/apache/maven/InternalErrorException.java @@ -21,7 +21,7 @@ package org.apache.maven; /** * Signals an internal error in Maven itself, e.g. a programming bug. - * + * * @author Benjamin Bentmann */ public class InternalErrorException http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/Maven.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java b/maven-core/src/main/java/org/apache/maven/Maven.java index 05fb6ed..8563847 100644 --- a/maven-core/src/main/java/org/apache/maven/Maven.java +++ b/maven-core/src/main/java/org/apache/maven/Maven.java @@ -30,5 +30,5 @@ public interface Maven @Deprecated String POMv4 = "pom.xml"; - MavenExecutionResult execute( MavenExecutionRequest request ); + MavenExecutionResult execute( MavenExecutionRequest request ); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/ReactorReader.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java index de31eb8..3aca28d 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -43,7 +43,7 @@ import org.eclipse.aether.util.artifact.ArtifactIdUtils; /** * An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either * as packaged jar if it has been built, or only compile output directory if packaging hasn't happened yet. - * + * * @author Jason van Zyl */ @Named( ReactorReader.HINT ) @@ -52,7 +52,7 @@ class ReactorReader implements WorkspaceReader { public static final String HINT = "reactor"; - + private static final Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); private Map<String, MavenProject> projectsByGAV; @@ -193,7 +193,7 @@ class ReactorReader /** * Tries to resolve the specified artifact from the artifacts of the given project. - * + * * @param project The project to try to resolve the artifact from, must not be <code>null</code>. * @param requestedArtifact The artifact to resolve, must not be <code>null</code>. * @return The matching artifact from the project or <code>null</code> if not found. Note that this @@ -234,7 +234,7 @@ class ReactorReader /** * Determines whether the specified artifact refers to test classes. - * + * * @param artifact The artifact to check, must not be {@code null}. * @return {@code true} if the artifact refers to test classes, {@code false} otherwise. */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java index 9190c0c..d7fd88e 100644 --- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java +++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java @@ -49,7 +49,7 @@ import org.eclipse.aether.util.repository.AuthenticationBuilder; /** * <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part * of the public API. In particular, this class can be changed or deleted without prior notice. - * + * * @author Benjamin Bentmann */ public class RepositoryUtils http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/SessionScoped.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java b/maven-core/src/main/java/org/apache/maven/SessionScoped.java index 3a1692f..f44ddbf 100644 --- a/maven-core/src/main/java/org/apache/maven/SessionScoped.java +++ b/maven-core/src/main/java/org/apache/maven/SessionScoped.java @@ -29,7 +29,7 @@ import com.google.inject.ScopeAnnotation; /** * Indicates that annotated component should be instantiated before session starts and discarded after session execution completes. - * + * * @author Jason van Zyl * @since 3.2.0 */ http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java index 16cdeff..6b18789 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/DefaultRepositoryRequest.java @@ -27,7 +27,7 @@ import org.apache.maven.project.MavenProject; /** * Collects basic settings to access the repository system. - * + * * @author Benjamin Bentmann */ public class DefaultRepositoryRequest @@ -52,7 +52,7 @@ public class DefaultRepositoryRequest /** * Creates a shallow copy of the specified repository request. - * + * * @param repositoryRequest The repository request to copy from, must not be {@code null}. */ public DefaultRepositoryRequest( RepositoryRequest repositoryRequest ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java ---------------------------------------------------------------------- diff --git a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java index 159d3e3..f56fb45 100644 --- a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java +++ b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java @@ -47,7 +47,7 @@ import org.eclipse.aether.repository.RemoteRepository; /** * <strong>Warning:</strong> This is an internal utility class that is only public for technical reasons, it is not part * of the public API. In particular, this class can be changed or deleted without prior notice. - * + * * @author Benjamin Bentmann */ public class LegacyLocalRepositoryManager
