Repository: maven Updated Branches: refs/heads/master 6b0b7a932 -> 0eb1e937b
http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java index 15a7a7b..bcc5895 100644 --- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java +++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulatorTest.java @@ -34,7 +34,7 @@ public class DefaultMavenExecutionRequestPopulatorTest { @Inject MavenExecutionRequestPopulator testee; - + public void testPluginRepositoryInjection() throws Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java index 951f133..dfa1817 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java @@ -409,7 +409,7 @@ public class LifecycleExecutorTest { return Collections.emptyList(); } - + public java.util.List<MavenProject> getAllSortedProjects() { return Collections.emptyList(); http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html index 8ad74b9..0233282 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/AboutTheStubs.html @@ -36,7 +36,7 @@ You can change/extend these stubs, and tests should not be breaking too much, si assert using expected values from the stubs. Normally, when you try to use data from the stubs that have not been properly populated, you'll get a nullpointer in your test and you then have to identify which stub creates that specific piece of data. - + The most important stubs are: LifecycleExecutionPlanCalculatorStub ProjectDependencyGraphStub http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java index 0d8cbdc..f60eace 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/mapping/LifecyclePhaseTest.java @@ -33,38 +33,38 @@ public class LifecyclePhaseTest { LifecyclePhase phase = new LifecyclePhase(); assertEquals( "", phase.toString() ); - + LifecycleMojo mojo1 = new LifecycleMojo(); mojo1.setGoal( "jar:jar" ); phase.setMojos( Arrays.asList( mojo1 ) ); assertEquals( "jar:jar", phase.toString() ); - + LifecycleMojo mojo2 = new LifecycleMojo(); mojo2.setGoal( "war:war" ); phase.setMojos( Arrays.asList( mojo1, mojo2 ) ); assertEquals( "jar:jar,war:war", phase.toString() ); } - + @Test public void testSet() { LifecyclePhase phase = new LifecyclePhase(); assertNull( phase.getMojos() ); - + phase.set( "" ); assertNotNull( phase.getMojos() ); assertEquals( 0, phase.getMojos().size() ); - + phase.set( "jar:jar, war:war" ); - + List<LifecycleMojo> mojos = phase.getMojos(); assertNotNull( mojos ); assertEquals( 2, mojos.size() ); - + LifecycleMojo mojo1 = mojos.get(0); assertNotNull( mojo1 ); assertEquals( "jar:jar", mojo1.getGoal() ); - + LifecycleMojo mojo2 = mojos.get(1); assertNotNull( mojo2 ); assertEquals( "war:war", mojo2.getGoal() ); http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java index 025e772..ed7f56c 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java @@ -336,7 +336,7 @@ public class PluginManagerTest pluginManager.loadPlugin( plugin, session.getCurrentProject().getRemotePluginRepositories(), session.getRepositorySession() ); ClassRealm pluginRealm = pluginManager.getPluginRealm( session, pluginDescriptor ); - + assertEquals(pluginRealm, pluginDescriptor.getComponents().get(0).getRealm()); } } http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java index 1e48441..9b647cd 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivateTest.java @@ -54,7 +54,7 @@ public class DefaultToolchainManagerPrivateTest @Mock private ToolchainFactory toolchainFactory_basicType; - + @Mock private ToolchainFactory toolchainFactory_rareType; @@ -113,7 +113,7 @@ public class DefaultToolchainManagerPrivateTest verify( logger ).error( "Missing toolchain factory for type: unknown. Possibly caused by misconfigured project." ); assertEquals( 0, toolchains.length ); } - + @Test public void testToolchainsForConfiguredType() throws Exception @@ -145,7 +145,7 @@ public class DefaultToolchainManagerPrivateTest verify( logger, never() ).error( anyString() ); assertEquals( 2, toolchains.length ); } - + @SuppressWarnings( "unchecked" ) @Test( expected = MisconfiguredToolchainException.class ) public void testMisconfiguredToolchain() @@ -159,7 +159,7 @@ public class DefaultToolchainManagerPrivateTest // execute toolchainManager.getToolchainsForType( "basic", session ); - + // verify fail( "Should exit with a MisconfiguredToolchainException" ); } http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java index 80fca09..ff6b8b5 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java @@ -42,7 +42,7 @@ import org.mockito.MockitoAnnotations; public class DefaultToolchainsBuilderTest { private static final String LS = System.getProperty( "line.separator" ); - + @Mock private ToolchainsReader toolchainsReader; @@ -143,7 +143,7 @@ public class DefaultToolchainsBuilderTest assertNotNull( result.getProblems() ); assertEquals( 0, result.getProblems().size() ); } - + @Test public void testStrictToolchainsParseException() throws Exception { @@ -151,18 +151,18 @@ public class DefaultToolchainsBuilderTest request.setGlobalToolchainsSource( new StringSource( "" ) ); ToolchainsParseException parseException = new ToolchainsParseException( "MESSAGE", 4, 2 ); when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenThrow( parseException ); - + try { toolchainBuilder.build( request ); } catch ( ToolchainsBuildingException e ) { - assertEquals( "1 problem was encountered while building the effective toolchains" + LS + + assertEquals( "1 problem was encountered while building the effective toolchains" + LS + "[FATAL] Non-parseable toolchains (memory): MESSAGE @ line 4, column 2" + LS, e.getMessage() ); } } - + @Test public void testIOException() throws Exception { @@ -170,16 +170,16 @@ public class DefaultToolchainsBuilderTest request.setGlobalToolchainsSource( new StringSource( "", "LOCATION" ) ); IOException ioException = new IOException( "MESSAGE" ); when( toolchainsReader.read( any( InputStream.class ), anyMap() ) ).thenThrow( ioException ); - + try { toolchainBuilder.build( request ); } catch ( ToolchainsBuildingException e ) { - assertEquals( "1 problem was encountered while building the effective toolchains" + LS + + assertEquals( "1 problem was encountered while building the effective toolchains" + LS + "[FATAL] Non-readable toolchains LOCATION: MESSAGE" + LS, e.getMessage() ); } } - + } http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom b/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom index f451418..03caa12 100644 --- a/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom +++ b/maven-core/src/test/remote-repo/org/apache/maven/its/a/0.1/a-0.1.pom @@ -29,7 +29,7 @@ under the License. <name>Maven Integration Test :: Dummy Artifact</name> <description> - + </description> <distributionManagement> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom b/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom index ca20cbf..149a241 100644 --- a/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom +++ b/maven-core/src/test/remote-repo/org/apache/maven/its/b/0.1/b-0.1.pom @@ -29,7 +29,7 @@ under the License. <name>Maven Integration Test :: Dummy Artifact</name> <description> - + </description> <distributionManagement> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom index 2169a65..d5167fc 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/junit/junit/3.8.1/junit-3.8.1.pom @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd "> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom index 8de3ce6..324ec34 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-SNAPSHOT.pom @@ -31,11 +31,11 @@ under the License. <artifactId>maven-artifact</artifactId> <version>3.0-SNAPSHOT</version> <name>Maven Artifact</name> - <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/maven/artifact/trunk</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/artifact/trunk</developerConnection> - <url>http://svn.apache.org/viewcvs.cgi/maven/artifact/trunk</url> - </scm> + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/maven/artifact/trunk</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/artifact/trunk</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/maven/artifact/trunk</url> + </scm> <dependencies> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -56,7 +56,7 @@ under the License. <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-provider-api</artifactId> <version>1.0-beta-2</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-file</artifactId> @@ -68,7 +68,7 @@ under the License. <artifactId>easymock</artifactId> <version>1.2_Java1.3</version> <scope>test</scope> - </dependency> + </dependency> </dependencies> <build> <plugins> @@ -80,25 +80,25 @@ under the License. <version>1.0.0</version> <model>src/main/mdo/metadata.mdo</model> </configuration> - <executions> - <execution> - <id>site-docs</id> - <phase>pre-site</phase> - <goals> - <goal>xdoc</goal> - <goal>xsd</goal> - </goals> - </execution> - <execution> - <id>standard</id> - <goals> - <goal>java</goal> - <goal>xpp3-reader</goal> - <goal>xpp3-writer</goal> - </goals> - </execution> - </executions> - </plugin> + <executions> + <execution> + <id>site-docs</id> + <phase>pre-site</phase> + <goals> + <goal>xdoc</goal> + <goal>xsd</goal> + </goals> + </execution> + <execution> + <id>standard</id> + <goals> + <goal>java</goal> + <goal>xpp3-reader</goal> + <goal>xpp3-writer</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom index 70114e7..764a5ca 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-extension/1/test-extension-1.pom @@ -35,7 +35,7 @@ <version>1.0-alpha-16</version> </dependency> </dependencies> - + <build> <plugins> <plugin> @@ -62,12 +62,12 @@ </plugin> </plugins> </build> - + <distributionManagement> <repository> <id>dummy</id> <url>file:///tmp/dummy-repo</url> </repository> </distributionManagement> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom index d9e4cde..ea7fbb8 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/core/test/test-lifecycle-and-artifactHandler/1/test-lifecycle-and-artifactHandler-1.pom @@ -33,12 +33,12 @@ </plugin> </plugins> </build> - + <distributionManagement> <repository> <id>dummy</id> <url>file:///tmp/dummy-repo</url> </repository> </distributionManagement> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom index b335040..1130094 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/apache/maven/maven-parent/5/maven-parent-5.pom @@ -291,9 +291,9 @@ under the License. <pluginManagement> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-4</version> + <version>2.0-beta-4</version> <configuration> <!-- This element will be overriden by children --> <tagBase>https://svn.apache.org/repos/asf/maven/pom/tags</tagBase> @@ -379,7 +379,7 @@ under the License. </plugin> </plugins> </reporting> - </profile> + </profile> <profile> <id>release</id> <build> @@ -451,10 +451,10 @@ under the License. </goals> </execution> </executions> - </plugin> + </plugin> </plugins> </build> - </profile> + </profile> </profiles> <scm> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom index be71f49..6025418 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-classworlds/1.2-alpha-10/plexus-classworlds-1.2-alpha-10.pom @@ -88,7 +88,7 @@ </profiles> <scm> <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-10</connection> - <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-10</developerConnection> + <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-10</developerConnection> <url>http://fisheye.codehaus.org/browse/plexus/plexus-classworlds/tags/plexus-classworlds-1.2-alpha-10</url> </scm> </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom index 0afa802..2adef07 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-components/1.1.6/plexus-components-1.1.6.pom @@ -21,7 +21,7 @@ <packaging>pom</packaging> <version>1.1.6</version> <name>Plexus Components Parent Project</name> - <!-- + <!-- TODO: should this be pushed down to all the dependencies? - a more stable API JAR may be useful, for the interfaces and classes such as AbstractLogEnabled --> @@ -35,25 +35,25 @@ <modules> <module>plexus-action</module> <module>plexus-archiver</module> - <module>plexus-bayesian</module> + <module>plexus-bayesian</module> <module>plexus-command</module> <module>plexus-compiler</module> - <module>plexus-drools</module> + <module>plexus-drools</module> <module>plexus-formica</module> <module>plexus-formica-web</module> <module>plexus-hibernate</module> - <module>plexus-i18n</module> - <module>plexus-interactivity</module> - <module>plexus-ircbot</module> + <module>plexus-i18n</module> + <module>plexus-interactivity</module> + <module>plexus-ircbot</module> <module>plexus-jdo</module> - <module>plexus-jetty-httpd</module> + <module>plexus-jetty-httpd</module> <module>plexus-jetty</module> - <module>plexus-mimetyper</module> + <module>plexus-mimetyper</module> <module>plexus-notification</module> <module>plexus-resource</module> <module>plexus-security</module> <module>plexus-summit</module> - <module>plexus-taskqueue</module> + <module>plexus-taskqueue</module> <module>plexus-velocity</module> <module>plexus-xmlrpc</module> </modules> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom index fbfdb2b..bcfc889 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus-container-default/1.0-alpha-32/plexus-container-default-1.0-alpha-32.pom @@ -36,8 +36,8 @@ <exclude>classworlds:classworlds</exclude> <exclude>junit:junit</exclude> <exclude>jmock:jmock</exclude> - <exclude>org.codehaus.plexus:plexus-classworlds</exclude> - <exclude>org.codehaus.plexus:plexus-utils</exclude> + <exclude>org.codehaus.plexus:plexus-classworlds</exclude> + <exclude>org.codehaus.plexus:plexus-utils</exclude> </excludes> </artifactSet> </configuration> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom index bc94e24..a7c4028 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom @@ -20,7 +20,7 @@ <port>6667</port> <channel>#plexus</channel> </configuration> - </notifier> + </notifier> </notifiers> </ciManagement> <inceptionYear>2001</inceptionYear> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom index 28ee574..e939ed1 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom @@ -20,7 +20,7 @@ <port>6667</port> <channel>#plexus</channel> </configuration> - </notifier> + </notifier> </notifiers> </ciManagement> <inceptionYear>2001</inceptionYear> @@ -30,7 +30,7 @@ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <distribution>repo</distribution> </license> - </licenses> + </licenses> <mailingLists> <mailingList> <name>Plexus User List</name> @@ -88,7 +88,7 @@ </releases> </repository> </repositories> - + <developers> <developer> <id>jvanzyl</id> @@ -303,6 +303,6 @@ </configuration> </plugin> </plugins> - </pluginManagement> + </pluginManagement> </build> </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom index 2cf5d56..6bcb8e3 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom @@ -20,7 +20,7 @@ <port>6667</port> <channel>#plexus</channel> </configuration> - </notifier> + </notifier> </notifiers> </ciManagement> <inceptionYear>2001</inceptionYear> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom index cba2014..2e04073 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom @@ -23,7 +23,7 @@ <port>6667</port> <channel>#plexus</channel> </configuration> - </notifier> + </notifier> </notifiers> </ciManagement> <inceptionYear>2001</inceptionYear> @@ -223,7 +223,7 @@ </organization> <modules> <!-- - + Until the bug is fixed in Maven which is pulling in the trunk to the appserver build. <module>plexus-appserver</module> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom index f6fca7c..ff75aba 100644 --- a/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom +++ b/maven-core/src/test/resources/org/apache/maven/extension/test-extension-repo/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom @@ -20,7 +20,7 @@ <port>6667</port> <channel>#plexus</channel> </configuration> - </notifier> + </notifier> </notifiers> </ciManagement> <inceptionYear>2001</inceptionYear> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom index d421176..554cfa9 100644 --- a/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom +++ b/maven-core/src/test/resources/org/apache/maven/project/workspace/buildFromRepo/tests/project-caching/1/project-caching-1.pom @@ -1,8 +1,8 @@ <project> <modelVersion>4.0.0</modelVersion> - + <groupId>tests</groupId> <artifactId>project-caching</artifactId> <version>1</version> - + </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml index 4fb0093..64de88a 100644 --- a/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml +++ b/maven-core/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml @@ -18,7 +18,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + <toolchains> <toolchain> <type>jdk</type> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java b/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java index 4656dd3..25c5aa5 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CliRequest.java @@ -113,8 +113,8 @@ public class CliRequest return request; } - public void setUserProperties( Properties properties ) + public void setUserProperties( Properties properties ) { - this.userProperties.putAll( properties ); + this.userProperties.putAll( properties ); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom b/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom index dcaf397..7e4415c 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-direct-deps/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven.errortest</groupId> <artifactId>test-maven-ext</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>junit</groupId> @@ -30,5 +30,5 @@ under the License. <version>[3.8,</version> </dependency> </dependencies> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom index 3c7f3f3..225c5f9 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-dep-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-dep-ver-maven-plugin/1/bad-ext-plugin-dep-ver-maven-plugin-1.pom @@ -5,7 +5,7 @@ <artifactId>bad-ext-plugin-dep-ver-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom index ffe6141..807d53f 100644 --- a/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/bad-ext-plugin-maven-ver/local-repo/org/apache/maven/errortest/bad-ext-plugin-maven-ver-maven-plugin/1/bad-ext-plugin-maven-ver-maven-plugin-1.pom @@ -5,11 +5,11 @@ <artifactId>bad-ext-plugin-maven-ver-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - + <prerequisites> <maven>10</maven> </prerequisites> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom b/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom index 7ac0490..1172857 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/err-loading-plugin/local-repo/org/apache/maven/errortest/err-loading-plugin-maven-plugin/1/err-loading-plugin-maven-plugin-1.pom @@ -5,7 +5,7 @@ <artifactId>err-loading-plugin-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom index e6dd7a2..960fbf6 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom @@ -5,7 +5,7 @@ <artifactId>dep</artifactId> <version>1</version> <packaging>pom</packaging> - + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom index e520ccc..422e8fa 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-ext-plugin/local-repo/org/apache/maven/errortest/err-resolving-ext-plugin-maven-plugin/1/err-resolving-ext-plugin-maven-plugin-1.pom @@ -5,7 +5,7 @@ <artifactId>err-resolving-ext-plugin-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom index e6dd7a2..960fbf6 100644 --- a/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/err-resolving-project-dep/project/local-repo/org/apache/maven/errortest/dep/1/dep-1.pom @@ -5,7 +5,7 @@ <artifactId>dep</artifactId> <version>1</version> <packaging>pom</packaging> - + <dependencies> <dependency> <groupId>junit</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom index 71edcf4..020fb07 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext-dep/1/test-maven-ext-dep-1.pom @@ -22,5 +22,5 @@ under the License. <groupId>org.apache.maven.errortest</groupId> <artifactId>test-maven-ext-dep</artifactId> <version>1</ver> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom index cd40200..72c2b45 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/ext-deps-resolve-err/local-repo/org/apache/maven/errortest/test-maven-ext/1/test-maven-ext-1.pom @@ -22,7 +22,7 @@ under the License. <groupId>org.apache.maven.errortest</groupId> <artifactId>test-maven-ext</artifactId> <version>1</version> - + <dependencies> <dependency> <groupId>org.apache.maven.errortest</groupId> @@ -30,5 +30,5 @@ under the License. <version>1</version> </dependency> </dependencies> - + </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom b/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom index b7f7d52..c9361ea 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-artifact-missing/local-repo/org/apache/maven/errortest/ext-plugin-artifact-missing-maven-plugin/1/ext-plugin-artifact-missing-maven-plugin-1.pom @@ -5,7 +5,7 @@ <artifactId>ext-plugin-artifact-missing-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom index 5aab61d..cfbb8fe 100644 --- a/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/ext-plugin-version-err/local-repo/org/apache/maven/errortest/ext-plugin-version-err-maven-plugin/1/ext-plugin-version-err-maven-plugin-1.pom @@ -5,7 +5,7 @@ <artifactId>ext-plugin-version-err-maven-plugin</artifactId> <packaging>maven-plugin</packaging> <version>1</version> - + <dependencies> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/local-repo/org/test/bad-pom/1/bad-pom-1.pom ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/local-repo/org/test/bad-pom/1/bad-pom-1.pom b/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/local-repo/org/test/bad-pom/1/bad-pom-1.pom index b1f29c4..40ae3b1 100644 --- a/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/local-repo/org/test/bad-pom/1/bad-pom-1.pom +++ b/maven-embedder/src/test/error-reporting-projects/interp-from-project/project/local-repo/org/test/bad-pom/1/bad-pom-1.pom @@ -3,7 +3,7 @@ <groupId>org.test</groupId> <artifactId>bad-pom</artifactId> <version>1</version> - + <packaging>${packaging}</packaging> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java index d926624..d5db8fb 100644 --- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java @@ -107,7 +107,7 @@ public class MavenCliTest } } - + /** * Read .mvn/maven.config with the following definitions: * <pre> @@ -125,10 +125,10 @@ public class MavenCliTest cli.initialize( request ); // read .mvn/maven.config cli.cli( request ); - + assertEquals( "5", request.commandLine.getOptionValue( CLIManager.THREADS ) ); } - + /** * Read .mvn/maven.config with the following definitions: * <pre> @@ -147,7 +147,7 @@ public class MavenCliTest // read .mvn/maven.config cli.cli( request ); cli.properties( request ); - + String revision = System.getProperty( "revision" ); assertEquals( "8.1.0", revision ); http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-embedder/src/test/projects/config/.mvn/maven.config ---------------------------------------------------------------------- diff --git a/maven-embedder/src/test/projects/config/.mvn/maven.config b/maven-embedder/src/test/projects/config/.mvn/maven.config index 3d0f13b..495dab8 100644 --- a/maven-embedder/src/test/projects/config/.mvn/maven.config +++ b/maven-embedder/src/test/projects/config/.mvn/maven.config @@ -1,2 +1,2 @@ --T8 --builder +-T8 --builder multithreaded http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java index a2e1141..42bc065 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java @@ -41,11 +41,11 @@ public class FileModelSource extends FileSource implements ModelSource2 { super( pomFile ); } - + /** - * + * * @return the file of this source - * + * * @deprecated instead use {@link #getFile()} */ @Deprecated @@ -53,7 +53,7 @@ public class FileModelSource extends FileSource implements ModelSource2 { return getFile(); } - + @Override public ModelSource2 getRelatedSource( String relPath ) { http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java index 041b0d6..9987625 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/Result.java @@ -46,7 +46,7 @@ import com.google.common.collect.Iterables; * <li>error - (partial) model and diagnostics * </ol> * Could encode these variants as subclasses, but kept in one for now - * + * * @author bbusjaeger * @param <T> */ http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java index cf9c4ce..4097146 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/StringModelSource.java @@ -25,7 +25,7 @@ import org.apache.maven.building.StringSource; * Wraps an ordinary {@link CharSequence} as a model source. * * @author Benjamin Bentmann - * + * * @deprecated instead use {@link StringSource} */ @Deprecated http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java index e41d74b..dcbbc52 100644 --- a/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java +++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/UrlModelSource.java @@ -27,7 +27,7 @@ import org.apache.maven.building.UrlSource; * Wraps an ordinary {@link URL} as a model source. * * @author Benjamin Bentmann - * + * * @deprecated instead use {@link UrlSource} */ @Deprecated http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/site/apt/index.apt ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt index 74fa041..a5b42b4 100644 --- a/maven-model-builder/src/site/apt/index.apt +++ b/maven-model-builder/src/site/apt/index.apt @@ -126,7 +126,7 @@ Maven Model Builder Notice that the 5 urls from the model (<<<project.url>>>, <<<project.scm.connection>>>, <<<project.scm.developerConnection>>>, <<<project.scm.url>>> and <<<project.distributionManagement.site.url>>>) have a special inheritance handling: - + ** if not configured in current model, the inherited value is parent's one with current artifact id appended, ** since Maven 3.4.0, if <<<project.directory>>> POM property value is defined, it is used instead of artifact id: http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java index d49e8df..53ce958 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java @@ -149,12 +149,12 @@ public class DefaultInheritanceAssemblerTest } } - public void testWithEmptyUrl() + public void testWithEmptyUrl() throws Exception { testInheritance( "empty-urls", false ); } - + public void testInheritance( String baseName ) throws Exception { @@ -195,7 +195,7 @@ public class DefaultInheritanceAssemblerTest XMLUnit.setIgnoreWhitespace( true ); XMLAssert.assertXMLEqual( control, test ); } - } + } public void testModulePathNotArtifactId() throws Exception http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java index 3832b0c..c23be0f 100644 --- a/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java +++ b/maven-model-builder/src/test/java/org/apache/maven/model/merge/MavenModelMergerTest.java @@ -73,7 +73,7 @@ public class MavenModelMergerTest Model model = new Model(); modelMerger.mergeModel_Prerequisites( model, parent, false, null ); assertNull( model.getPrerequisites() ); - + Prerequisites modelPrerequisites = new Prerequisites(); modelPrerequisites.setMaven( "3.0" ); model.setPrerequisites( modelPrerequisites ); @@ -90,7 +90,7 @@ public class MavenModelMergerTest Model model = new Model(); modelMerger.mergeModel_Profiles( model, parent, false, null ); assertEquals( 0, model.getProfiles().size() ); - + Profile modelProfile = new Profile(); modelProfile.setId( "MODEL" ); model.setProfiles( Collections.singletonList( modelProfile ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml index 7031f44..d051a7c 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-child.xml @@ -34,7 +34,7 @@ under the License. <description> artifactId == "child-artifact-id" but expect path on SCM and site == "child" - feature: support "project.directory" property, ressembling future model addition of "directory" element along "artifactId" + feature: support "project.directory" property, ressembling future model addition of "directory" element along "artifactId" </description> <properties> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml ---------------------------------------------------------------------- diff --git a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml index e82f289..fd2ff96 100644 --- a/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml +++ b/maven-model-builder/src/test/resources/poms/inheritance/module-path-not-artifactId-expected.xml @@ -36,7 +36,7 @@ under the License. <description> artifactId == "child-artifact-id" but expect path on SCM and site == "child" - feature: support "project.directory" property, ressembling future model addition of "directory" element along "artifactId" + feature: support "project.directory" property, ressembling future model addition of "directory" element along "artifactId" </description> <!-- 5 inherited urls with ${project.directory} added to parent instead of artifactId --> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-model/src/main/mdo/maven.mdo ---------------------------------------------------------------------- diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo index 9822670..351fc45 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -245,7 +245,7 @@ <description> <![CDATA[ The URL to the project's homepage. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if project's <code>child.project.url.inherit.append.path="false"</code> ]]> </description> @@ -2175,7 +2175,7 @@ <a href="https://maven.apache.org/scm/scm-url-format.html";>URL format</a> and <a href="https://maven.apache.org/scm/scms-overview.html";>list of supported SCMs</a>. This connection is read-only. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if scm's <code>child.scm.connection.inherit.append.path="false"</code> ]]> </description> @@ -2188,7 +2188,7 @@ <![CDATA[ Just like <code>connection</code>, but for developers, i.e. this scm connection will not be read only. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if scm's <code>child.scm.developerConnection.inherit.append.path="false"</code> ]]> </description> @@ -2207,7 +2207,7 @@ <description> <![CDATA[ The URL to the project's browsable SCM repository, such as ViewVC or Fisheye. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if scm's <code>child.scm.url.inherit.append.path="false"</code> ]]> </description> @@ -2723,7 +2723,7 @@ <description> <![CDATA[ The url of the location where website is deployed, in the form <code>protocol://hostname/path</code>. - <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if + <br /><b>Default value is</b>: parent value [+ path adjustment] + (artifactId or project.directory property), or just parent value if site's <code>child.site.url.inherit.append.path="false"</code> ]]> </description> http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java index 3c2d32a..711261d 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/FileSettingsSource.java @@ -27,7 +27,7 @@ import org.apache.maven.building.FileSource; * Wraps an ordinary {@link File} as a settings source. * * @author Benjamin Bentmann - * + * * @deprecated instead use {@link FileSource} */ @Deprecated http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java index 413a357..a933b09 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsSource.java @@ -25,7 +25,7 @@ import org.apache.maven.building.Source; * Provides access to the contents of settings independently of the backing store (e.g. file system, database, memory). * * @author Benjamin Bentmann - * + * * @deprecated instead use {@link Source} */ @Deprecated http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java index dbe9758..989fc0e 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/StringSettingsSource.java @@ -25,7 +25,7 @@ import org.apache.maven.building.StringSource; * Wraps an ordinary {@link CharSequence} as a settings source. * * @author Benjamin Bentmann - * + * * @deprecated instead use {@link StringSource} */ @Deprecated http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java index 2b40f64..1adc4bf 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/building/UrlSettingsSource.java @@ -27,7 +27,7 @@ import org.apache.maven.building.UrlSource; * Wraps an ordinary {@link URL} as a settings source. * * @author Benjamin Bentmann - * + * * @deprecated instead use {@link UrlSource} */ @Deprecated @@ -56,5 +56,5 @@ public class UrlSettingsSource extends UrlSource { return getUrl(); } - + } http://git-wip-us.apache.org/repos/asf/maven/blob/0eb1e937/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java ---------------------------------------------------------------------- diff --git a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java index 1e31f50..e33dc49 100644 --- a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java +++ b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java @@ -148,7 +148,7 @@ public class DefaultSettingsValidator if ( proxies != null ) { Set<String> proxyIds = new HashSet<>(); - + for ( Proxy proxy : proxies ) { if ( !proxyIds.add( proxy.getId() ) )
