You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/09/20 18:52:03 UTC
svn commit: r697393 [2/3] - in
/maven/core-integration-testing/trunk/core-integration-tests/src/test:
java/org/apache/maven/integrationtests/
resources/it0111-pluginThatRequiresResourceFromAnExtension/
resources/it0114-extensionThatProvidesResources/ r...
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java Sat Sep 20 09:51:58 2008
@@ -1,73 +1,73 @@
-package org.apache.maven.integrationtests;
-
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.it.VerificationException;
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Tests that the PluginDescriptor.getArtifacts() call returns all of the dependencies of the plugin,
- * not just those that made it past the filter excluding Maven's core artifacts.
- */
-public class MavenITmng3473PluginReportCrash
- extends AbstractMavenIntegrationTestCase
-{
- public MavenITmng3473PluginReportCrash()
- throws InvalidVersionSpecificationException
- {
- super( "(2.0.8,)" ); // >2.0.8
- }
- public void testitMNG3473 ()
- throws Exception
- {
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3473PluginReportCrash" );
-
- Verifier verifier = new Verifier( testDir.getAbsolutePath() );
-
-
- File logFile = new File( testDir, "log.txt" );
-
- // force the use of the 2.4.1 plugin version via a profile here...
- List cliOptions = new ArrayList();
- cliOptions.add( "-Pplugin-2.4.1" );
- verifier.setCliOptions( cliOptions );
-
- verifier.executeGoal( "install" );
- verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- logFile.renameTo( new File( testDir, "log-2.4.1-preinstall.txt" ) );
-
- //should succeed with 2.4.1
- verifier.executeGoals( Arrays.asList( new String[]{ "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom", "site" } ) );
-
- // NOTE: Velocity prints an [ERROR] line pertaining to an incorrect macro usage when run in 2.1, so this doesn't work.
-// verifier.verifyErrorFreeLog();
- verifier.resetStreams();
-
- logFile.renameTo( new File( testDir, "log-2.4.1.txt" ) );
-
- //should fail with 2.4
- cliOptions.clear();
- cliOptions.add( "-Pplugin-2.4" );
- verifier.setCliOptions( cliOptions );
-
- try
- {
- verifier.executeGoal( "site" );
- }
- catch (VerificationException e)
- {
- //expected this but don't require it cause some os's don't return the correct error code
- }
- verifier.verifyTextInLog( "org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException" );
- verifier.resetStreams();
-
- logFile.renameTo( new File( testDir, "log-2.4.txt" ) );
- }
-}
+package org.apache.maven.integrationtests;
+
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
+import org.apache.maven.it.VerificationException;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Tests that the PluginDescriptor.getArtifacts() call returns all of the dependencies of the plugin,
+ * not just those that made it past the filter excluding Maven's core artifacts.
+ */
+public class MavenITmng3473PluginReportCrash
+ extends AbstractMavenIntegrationTestCase
+{
+ public MavenITmng3473PluginReportCrash()
+ throws InvalidVersionSpecificationException
+ {
+ super( "(2.0.8,)" ); // >2.0.8
+ }
+ public void testitMNG3473 ()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3473PluginReportCrash" );
+
+ Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+
+
+ File logFile = new File( testDir, "log.txt" );
+
+ // force the use of the 2.4.1 plugin version via a profile here...
+ List cliOptions = new ArrayList();
+ cliOptions.add( "-Pplugin-2.4.1" );
+ verifier.setCliOptions( cliOptions );
+
+ verifier.executeGoal( "install" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ logFile.renameTo( new File( testDir, "log-2.4.1-preinstall.txt" ) );
+
+ //should succeed with 2.4.1
+ verifier.executeGoals( Arrays.asList( new String[]{ "org.apache.maven.plugins:maven-help-plugin:2.0.2:effective-pom", "site" } ) );
+
+ // NOTE: Velocity prints an [ERROR] line pertaining to an incorrect macro usage when run in 2.1, so this doesn't work.
+// verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ logFile.renameTo( new File( testDir, "log-2.4.1.txt" ) );
+
+ //should fail with 2.4
+ cliOptions.clear();
+ cliOptions.add( "-Pplugin-2.4" );
+ verifier.setCliOptions( cliOptions );
+
+ try
+ {
+ verifier.executeGoal( "site" );
+ }
+ catch (VerificationException e)
+ {
+ //expected this but don't require it cause some os's don't return the correct error code
+ }
+ verifier.verifyTextInLog( "org/apache/maven/doxia/module/site/manager/SiteModuleNotFoundException" );
+ verifier.resetStreams();
+
+ logFile.renameTo( new File( testDir, "log-2.4.txt" ) );
+ }
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3671PluginLevelDepInterpolationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3679PluginExecIdInterpolationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3680InvalidDependencyPOMTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3684BuildPluginParameterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3693PomFileBasedirChangeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3694ReactorProjectsDynamismTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3703ExecutionProjectWithRelativePathsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3704LifecycleExecutorWrapperTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3710PollutedClonedPluginsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3716AggregatorForkingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3723ConcreteParentProjectTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3724ExecutionProjectSyncTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/readme.txt
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/readme.txt?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/readme.txt (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/readme.txt Sat Sep 20 09:51:58 2008
@@ -1 +1 @@
-This test is disabled and replaced with it0114. This test uses checkstyle directly and doesn't completely reproduce all issues with extensions.
+This test is disabled and replaced with it0114. This test uses checkstyle directly and doesn't completely reproduce all issues with extensions.
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/readme.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/Readme.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/it0114_rule_set.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/it0114_rule_set.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/it0114_rule_set.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/it0114_rule_set.xml Sat Sep 20 09:51:58 2008
@@ -1,112 +1,112 @@
-<?xml version="1.0"?>
-<ruleset name="EPHS Custom ruleset"
- xmlns="http://pmd.sf.net/ruleset/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
- xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-
- <description>
- This ruleset checks EPHS code
- </description>
-
- <rule ref="rulesets/finalizers.xml"/>
-
-
- <rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
-
- <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>
- <rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>
- <rule ref="rulesets/optimizations.xml/UseArraysAsList"/>
- <rule ref="rulesets/optimizations.xml/AvoidArrayLoops"/>
- <!--<rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation"/> -->
-
- <rule ref="rulesets/j2ee.xml/UseProperClassLoader"/>
-
-
- <rule ref="rulesets/basic.xml/EmptyCatchBlock"/>
- <rule ref="rulesets/basic.xml/EmptyIfStmt"/>
- <rule ref="rulesets/basic.xml/EmptyWhileStmt"/>
- <rule ref="rulesets/basic.xml/EmptyTryBlock"/>
- <rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>
- <rule ref="rulesets/basic.xml/EmptySwitchStatements"/>
- <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
- <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
- <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
- <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>
- <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
- <rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>
- <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
- <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
- <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
- <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
- <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
- <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/>
- <rule ref="rulesets/basic.xml/UselessOperationOnImmutable"/>
- <!-- <rule ref="rulesets/basic.xml/NullPointerException"/> -->
- <rule ref="rulesets/basic.xml/AvoidThreadGroup"/>
- <!-- <rule ref="rulesets/basic.xml/BrokenNullCheck"/> -->
-
- <rule ref="rulesets/sunsecure.xml"/>
- <rule ref="rulesets/strictexception.xml"/>
-
- <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
- <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
-
- <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
-
-
- <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>
- <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
- <rule ref="rulesets/design.xml/CloseResource"/>
- <rule ref="rulesets/design.xml/NonStaticInitializer"/>
- <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>
- <rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>
- <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
- <rule ref="rulesets/design.xml/BadComparison"/>
- <rule ref="rulesets/design.xml/EqualsNull"/>
- <rule ref="rulesets/design.xml/InstantiationToGetClass"/>
- <rule ref="rulesets/design.xml/IdempotentOperations"/>
- <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>
- <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>
- <rule ref="rulesets/design.xml/MissingBreakInSwitch"/>
- <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>
- <rule ref="rulesets/design.xml/SimplifyConditional"/>
- <rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>
- <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
- <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter"/>
- <rule ref="rulesets/design.xml/PreserveStackTrace"/>
-
- <rule ref="rulesets/strings.xml/StringInstantiation"/>
- <rule ref="rulesets/strings.xml/StringToString"/>
- <rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>
- <rule ref="rulesets/strings.xml/UseStringBufferLength"/>
- <rule ref="rulesets/strings.xml/InsufficientStringBufferDeclaration"/>
- <!--<rule ref="rulesets/strings.xml/UselessStringValueOf"/> -->
-
-
- <rule ref="rulesets/imports.xml"/>
-
- <rule ref="rulesets/naming.xml/VariableNamingConventions"/>
-
- <!--<rule ref="rulesets/naming.xml/AvoidDollarSign"/> -->
- <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>
- <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>
- <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName"/>
- <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>
- <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>
- <rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>
-
- <rule ref="rulesets/naming.xml/NoPackage"/>
- <rule ref="rulesets/naming.xml/PackageCase"/>
- <rule ref="rulesets/naming.xml/MisleadingVariableName"/>
-
-
- <rule ref="rulesets/logging-java.xml/SystemPrintln"/>
- <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>
-
- <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>
-
-
- <rule ref="rulesets/braces.xml"/>
-
+<?xml version="1.0"?>
+<ruleset name="EPHS Custom ruleset"
+ xmlns="http://pmd.sf.net/ruleset/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+ xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+
+ <description>
+ This ruleset checks EPHS code
+ </description>
+
+ <rule ref="rulesets/finalizers.xml"/>
+
+
+ <rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>
+
+ <rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>
+ <rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>
+ <rule ref="rulesets/optimizations.xml/UseArraysAsList"/>
+ <rule ref="rulesets/optimizations.xml/AvoidArrayLoops"/>
+ <!--<rule ref="rulesets/optimizations.xml/UnnecessaryWrapperObjectCreation"/> -->
+
+ <rule ref="rulesets/j2ee.xml/UseProperClassLoader"/>
+
+
+ <rule ref="rulesets/basic.xml/EmptyCatchBlock"/>
+ <rule ref="rulesets/basic.xml/EmptyIfStmt"/>
+ <rule ref="rulesets/basic.xml/EmptyWhileStmt"/>
+ <rule ref="rulesets/basic.xml/EmptyTryBlock"/>
+ <rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/EmptySwitchStatements"/>
+ <rule ref="rulesets/basic.xml/JumbledIncrementer"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>
+ <rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>
+ <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>
+ <rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>
+ <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>
+ <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>
+ <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>
+ <rule ref="rulesets/basic.xml/BooleanInstantiation"/>
+ <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>
+ <rule ref="rulesets/basic.xml/ClassCastExceptionWithToArray"/>
+ <rule ref="rulesets/basic.xml/UselessOperationOnImmutable"/>
+ <!-- <rule ref="rulesets/basic.xml/NullPointerException"/> -->
+ <rule ref="rulesets/basic.xml/AvoidThreadGroup"/>
+ <!-- <rule ref="rulesets/basic.xml/BrokenNullCheck"/> -->
+
+ <rule ref="rulesets/sunsecure.xml"/>
+ <rule ref="rulesets/strictexception.xml"/>
+
+ <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
+ <rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>
+
+ <rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>
+
+
+ <rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>
+ <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>
+ <rule ref="rulesets/design.xml/CloseResource"/>
+ <rule ref="rulesets/design.xml/NonStaticInitializer"/>
+ <rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>
+ <rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>
+ <rule ref="rulesets/design.xml/OptimizableToArrayCall"/>
+ <rule ref="rulesets/design.xml/BadComparison"/>
+ <rule ref="rulesets/design.xml/EqualsNull"/>
+ <rule ref="rulesets/design.xml/InstantiationToGetClass"/>
+ <rule ref="rulesets/design.xml/IdempotentOperations"/>
+ <rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>
+ <rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>
+ <rule ref="rulesets/design.xml/MissingBreakInSwitch"/>
+ <rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>
+ <rule ref="rulesets/design.xml/SimplifyConditional"/>
+ <rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>
+ <rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>
+ <rule ref="rulesets/design.xml/UnsynchronizedStaticDateFormatter"/>
+ <rule ref="rulesets/design.xml/PreserveStackTrace"/>
+
+ <rule ref="rulesets/strings.xml/StringInstantiation"/>
+ <rule ref="rulesets/strings.xml/StringToString"/>
+ <rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>
+ <rule ref="rulesets/strings.xml/UseStringBufferLength"/>
+ <rule ref="rulesets/strings.xml/InsufficientStringBufferDeclaration"/>
+ <!--<rule ref="rulesets/strings.xml/UselessStringValueOf"/> -->
+
+
+ <rule ref="rulesets/imports.xml"/>
+
+ <rule ref="rulesets/naming.xml/VariableNamingConventions"/>
+
+ <!--<rule ref="rulesets/naming.xml/AvoidDollarSign"/> -->
+ <rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>
+ <rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>
+ <rule ref="rulesets/naming.xml/SuspiciousEqualsMethodName"/>
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>
+ <rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>
+ <rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>
+
+ <rule ref="rulesets/naming.xml/NoPackage"/>
+ <rule ref="rulesets/naming.xml/PackageCase"/>
+ <rule ref="rulesets/naming.xml/MisleadingVariableName"/>
+
+
+ <rule ref="rulesets/logging-java.xml/SystemPrintln"/>
+ <rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>
+
+ <rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>
+
+
+ <rule ref="rulesets/braces.xml"/>
+
</ruleset>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/it0114_rule_set.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,31 +1,31 @@
-<?xml version="1.0"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0114</groupId>
- <artifactId>it0114-extension</artifactId>
- <packaging>pom</packaging>
- <version>1.0</version>
- <name>it0114 - extension</name>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/assembly.xml</descriptor>
- </descriptors>
- <outputDirectory>target</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0114</groupId>
+ <artifactId>it0114-extension</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0</version>
+ <name>it0114 - extension</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <outputDirectory>target</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/src/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/src/assembly/assembly.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/src/assembly/assembly.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/src/assembly/assembly.xml Sat Sep 20 09:51:58 2008
@@ -1,16 +1,16 @@
- <assembly>
- <id></id>
- <formats>
- <format>jar</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>.</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>it0114_rule_set.xml</include>
- </includes>
- </fileSet>
- </fileSets>
- </assembly>
+ <assembly>
+ <id></id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>it0114_rule_set.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+ </assembly>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/extension/src/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0114</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
- <name>it0114 - parent</name>
- <modules>
- <module>extension</module>
- <module>test-plugin</module>
- </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0114</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <name>it0114 - parent</name>
+ <modules>
+ <module>extension</module>
+ <module>test-plugin</module>
+ </modules>
+</project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,26 +1,26 @@
-<?xml version="1.0"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0114</groupId>
- <artifactId>it0114-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <version>1.0</version>
- <name>it0114 - plugin</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0</version>
- </dependency>
- </dependencies>
-
- </project>
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0114</groupId>
+ <artifactId>it0114-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0</version>
+ <name>it0114 - plugin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ </project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/src/main/java/org/apache/maven/plugin/It0014Mojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/src/main/java/org/apache/maven/plugin/It0014Mojo.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/src/main/java/org/apache/maven/plugin/It0014Mojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/src/main/java/org/apache/maven/plugin/It0014Mojo.java Sat Sep 20 09:51:58 2008
@@ -1,31 +1,31 @@
-package org.apache.maven.plugin;
-
-import java.net.URL;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @goal test
- * @phase verify
- */
-public class It0014Mojo
- extends AbstractMojo
-{
-
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- ClassLoader cl = this.getClass().getClassLoader();
- URL url = cl.getResource( "it0114_rule_set.xml" );
-
- if (url != null)
- {
- this.getLog().info( "Found Url: "+ url.getFile() );
- }
- else
- {
- throw new MojoExecutionException("Can't find it0114_rule_set.xml on classpath!!");
- }
-
- }
-
-}
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ * @goal test
+ * @phase verify
+ */
+public class It0014Mojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ ClassLoader cl = this.getClass().getClassLoader();
+ URL url = cl.getResource( "it0114_rule_set.xml" );
+
+ if (url != null)
+ {
+ this.getLog().info( "Found Url: "+ url.getFile() );
+ }
+ else
+ {
+ throw new MojoExecutionException("Can't find it0114_rule_set.xml on classpath!!");
+ }
+
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0114-extensionThatProvidesResources/test-plugin/src/main/java/org/apache/maven/plugin/It0014Mojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/src/main/java/org/apache/maven/its/it0115/XarMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-extension/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/pom.xml Sat Sep 20 09:51:58 2008
@@ -11,16 +11,16 @@
<inceptionYear>2007</inceptionYear>
<packaging>xar</packaging>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.its.it0115</groupId>
- <artifactId>test-extension</artifactId>
- <version>1.0-SNAPSHOT</version>
- </extension>
- </extensions>
- </build>
-</project>
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.it0115</groupId>
+ <artifactId>test-extension</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </extension>
+ </extensions>
+ </build>
+
+</project>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0115-customArtifactHandlerAndCustomLifecycle/test-project/src/main/resources/package.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt Sat Sep 20 09:51:58 2008
@@ -1,5 +1,5 @@
-This test checks the order of plugin searching. In <2.0.7, Maven searched codehaus before apache.
-
-This test also verifies that prefixes set by a user in the settings are searched first before the standard ones.
-
+This test checks the order of plugin searching. In <2.0.7, Maven searched codehaus before apache.
+
+This test also verifies that prefixes set by a user in the settings are searched first before the standard ones.
+
This is to fix MNG-2926. This test will fail with Maven <=2.0.6.
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/Readme.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0119</groupId>
- <artifactId>parent</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
- <name>it0119 - parent</name>
- <modules>
- <module>test-plugin-apache</module>
- <module>test-plugin-codehaus</module>
- <module>test-plugin-custom</module>
- </modules>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.it0119</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <name>it0119 - parent</name>
+ <modules>
+ <module>test-plugin-apache</module>
+ <module>test-plugin-codehaus</module>
+ <module>test-plugin-custom</module>
+ </modules>
+</project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,26 +1,26 @@
-<?xml version="1.0"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>it0119</artifactId>
- <packaging>maven-plugin</packaging>
- <version>1.0</version>
- <name>it0119 - Apache plugin</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0</version>
- </dependency>
- </dependencies>
-
- </project>
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>it0119</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0</version>
+ <name>it0119 - Apache plugin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ </project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java Sat Sep 20 09:51:58 2008
@@ -1,19 +1,19 @@
-package org.apache.maven.plugin;
-
-import java.net.URL;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @goal apache
- */
-public class ApacheMojo
- extends AbstractMojo
-{
-
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- this.getLog().info("Ran Test Apache");
- }
-
-}
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ * @goal apache
+ */
+public class ApacheMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Apache");
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/ApacheMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java Sat Sep 20 09:51:58 2008
@@ -1,19 +1,19 @@
-package org.apache.maven.plugin;
-
-import java.net.URL;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @goal id
- */
-public class IDMojo
- extends AbstractMojo
-{
-
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- this.getLog().info("Ran Test Apache");
- }
-
-}
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ * @goal id
+ */
+public class IDMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Apache");
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-apache/src/main/java/org/apache/maven/plugin/IDMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,26 +1,26 @@
-<?xml version="1.0"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>it0119</artifactId>
- <packaging>maven-plugin</packaging>
- <version>1.0</version>
- <name>it0119 - Codehaus plugin</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0</version>
- </dependency>
- </dependencies>
-
- </project>
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>it0119</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0</version>
+ <name>it0119 - Codehaus plugin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ </project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java Sat Sep 20 09:51:58 2008
@@ -1,19 +1,19 @@
-package org.apache.maven.plugin;
-
-import java.net.URL;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @goal codehaus
- */
-public class CodehausMojo
- extends AbstractMojo
-{
-
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- this.getLog().info("Ran Test Codehaus");
- }
-
-}
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ * @goal codehaus
+ */
+public class CodehausMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Codehaus");
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/CodehausMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java Sat Sep 20 09:51:58 2008
@@ -1,19 +1,19 @@
-package org.apache.maven.plugin;
-
-import java.net.URL;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @goal id
- */
-public class IDMojo
- extends AbstractMojo
-{
-
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- this.getLog().info("Ran Test Codehaus");
- }
-
-}
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ * @goal id
+ */
+public class IDMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Codehaus");
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-codehaus/src/main/java/org/apache/maven/plugin/IDMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,26 +1,26 @@
-<?xml version="1.0"?><project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>it0119</groupId>
- <artifactId>it0119</artifactId>
- <packaging>maven-plugin</packaging>
- <version>1.0</version>
- <name>it0119 - Custom plugin</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0</version>
- </dependency>
- </dependencies>
-
- </project>
+<?xml version="1.0"?><project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>it0119</groupId>
+ <artifactId>it0119</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1.0</version>
+ <name>it0119 - Custom plugin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0</version>
+ </dependency>
+ </dependencies>
+
+ </project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java Sat Sep 20 09:51:58 2008
@@ -1,19 +1,19 @@
-package org.apache.maven.plugin;
-
-import java.net.URL;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @goal custom
- */
-public class CustomMojo
- extends AbstractMojo
-{
-
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- this.getLog().info("Ran Test Custom");
- }
-
-}
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ * @goal custom
+ */
+public class CustomMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Custom");
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/CustomMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java Sat Sep 20 09:51:58 2008
@@ -1,19 +1,19 @@
-package org.apache.maven.plugin;
-
-import java.net.URL;
-
-/**
- * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
- * @goal id
- */
-public class IDMojo
- extends AbstractMojo
-{
-
- public void execute()
- throws MojoExecutionException, MojoFailureException
- {
- this.getLog().info("Ran Test Custom");
- }
-
-}
+package org.apache.maven.plugin;
+
+import java.net.URL;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ * @goal id
+ */
+public class IDMojo
+ extends AbstractMojo
+{
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ this.getLog().info("Ran Test Custom");
+ }
+
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-plugin-custom/src/main/java/org/apache/maven/plugin/IDMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,13 +1,13 @@
-<?xml version="1.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>
- <groupId>org.apache.maven.its.it0119</groupId>
- <artifactId>it0119-plugin-runner</artifactId>
- <version>1.0</version>
- <packaging>pom</packaging>
- <name>it0119 - plugin runner</name>
- <build>
- </build>
+<?xml version="1.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>
+ <groupId>org.apache.maven.its.it0119</groupId>
+ <artifactId>it0119-plugin-runner</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+ <name>it0119 - plugin runner</name>
+ <build>
+ </build>
</project>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml Sat Sep 20 09:51:58 2008
@@ -1,5 +1,5 @@
-<settings>
-<pluginGroups>
- <pluginGroup>it0119</pluginGroup>
-</pluginGroups>
+<settings>
+<pluginGroups>
+ <pluginGroup>it0119</pluginGroup>
+</pluginGroups>
</settings>
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0119-pluginprefixorder/test-project/settings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/dependencyManagement/child/grandchild1/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/dependencyManagement/child/grandchild2/src/main/java/org/apache/maven/mng624/World.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/dependencyManagement/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/dependencyManagement/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/noParentInTree/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/noParentInTree/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child2/grandchild/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child3/child3child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/grandchild2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/optionalVersion/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/parentBadPath/main/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/parentBadPath/main/src/main/java/Hello.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/parentBadPath/main/src/test/java/HelloTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/parentBadPath/parent/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/parentBadPath/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/simple/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/simple/child/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/simple/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child1/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child2/grandchild/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child2/grandchild/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child3/child3child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child3/child3child/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/child4/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/grandchild2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/grandchild2/src/main/java/org/apache/maven/mng624/HelloWorld.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-0624/versionInProperty/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/test/java/com/mycompany/app/SomeGeneralTestClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/main/java/com/somecompany/OtherAppRequiringGeneralTestClass.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,23 +1,23 @@
-<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>
- <parent>
- <groupId>org.apache.maven.its.mng2123</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- </parent>
- <artifactId>artifact-combined</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.its.mng2123</groupId>
- <artifactId>artifact-fix</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.its.mng2123</groupId>
- <artifactId>artifact-range</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
-
-</project>
+<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>
+ <parent>
+ <groupId>org.apache.maven.its.mng2123</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ </parent>
+ <artifactId>artifact-combined</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng2123</groupId>
+ <artifactId>artifact-fix</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.its.mng2123</groupId>
+ <artifactId>artifact-range</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/src/main/java/Class.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/src/main/java/Class.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/src/main/java/Class.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/src/main/java/Class.java Sat Sep 20 09:51:58 2008
@@ -1,9 +1,9 @@
-public class Class
-{
-
-public static void main(String[] args)
-{
- System.out.println("hello");
- }
-
+public class Class
+{
+
+public static void main(String[] args)
+{
+ System.out.println("hello");
+ }
+
}
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-combined/src/main/java/Class.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,20 +1,20 @@
-<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>
- <parent>
- <groupId>org.apache.maven.its.mng2123</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- </parent>
- <artifactId>artifact-fix</artifactId>
- <version>1.0</version>
- <name>Artifact fix Version</name>
- <dependencies>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
- </dependencies>
-</project>
+<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>
+ <parent>
+ <groupId>org.apache.maven.its.mng2123</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ </parent>
+ <artifactId>artifact-fix</artifactId>
+ <version>1.0</version>
+ <name>Artifact fix Version</name>
+ <dependencies>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/src/main/java/Class.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/src/main/java/Class.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/src/main/java/Class.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/src/main/java/Class.java Sat Sep 20 09:51:58 2008
@@ -1,9 +1,9 @@
-public class Class
-{
-
-public static void main(String[] args)
-{
- System.out.println("hello");
- }
-
+public class Class
+{
+
+public static void main(String[] args)
+{
+ System.out.println("hello");
+ }
+
}
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-fix/src/main/java/Class.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,19 +1,19 @@
-<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>
- <parent>
- <groupId>org.apache.maven.its.mng2123</groupId>
- <artifactId>parent</artifactId>
- <version>1</version>
- </parent>
- <name>STC Checkstyle</name>
- <artifactId>artifact-range</artifactId>
- <version>1.0</version>
- <dependencies>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>[2.0,3.1.99]</version>
- </dependency>
- </dependencies>
-</project>
+<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>
+ <parent>
+ <groupId>org.apache.maven.its.mng2123</groupId>
+ <artifactId>parent</artifactId>
+ <version>1</version>
+ </parent>
+ <name>STC Checkstyle</name>
+ <artifactId>artifact-range</artifactId>
+ <version>1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>[2.0,3.1.99]</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/src/main/java/Class.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/src/main/java/Class.java?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/src/main/java/Class.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/src/main/java/Class.java Sat Sep 20 09:51:58 2008
@@ -1,9 +1,9 @@
-public class Class
-{
-
-public static void main(String[] args)
-{
- System.out.println("hello");
- }
-
+public class Class
+{
+
+public static void main(String[] args)
+{
+ System.out.println("hello");
+ }
+
}
\ No newline at end of file
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/artifact-range/src/main/java/Class.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/pom.xml?rev=697393&r1=697392&r2=697393&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/pom.xml Sat Sep 20 09:51:58 2008
@@ -1,14 +1,14 @@
-<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>
- <groupId>org.apache.maven.its.mng2123</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1</version>
- <name>Checkstyle</name>
- <!--
- <modules>
- <module>checkstyle-assembly</module>
- <module>checkstyle-test</module>
- </modules>
- -->
-</project>
+<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>
+ <groupId>org.apache.maven.its.mng2123</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1</version>
+ <name>Checkstyle</name>
+ <!--
+ <modules>
+ <module>checkstyle-assembly</module>
+ <module>checkstyle-test</module>
+ </modules>
+ -->
+</project>
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native