svn commit: r589460 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/mng2277aggregatorPlugins/ resources/mng2277aggregatorP
Author: brianf Date: Sun Oct 28 18:24:29 2007 New Revision: 589460 URL: http://svn.apache.org/viewvc?rev=589460view=rev Log: IT for MNG-2277 Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/ (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/mvn maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/readme.txt maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/java/Class.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=589460r1=589459r2=589460view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Sun Oct 28 18:24:29 2007 @@ -141,7 +141,7 @@ suite.addTestSuite( MavenIT0087Test.class ); suite.addTestSuite( MavenIT0088Test.class ); suite.addTestSuite( MavenIT0089Test.class ); -suite.addTestSuite(MavenIT0090Test.class); +suite.addTestSuite( MavenIT0090Test.class); suite.addTestSuite( MavenIT0092Test.class ); suite.addTestSuite( MavenIT0094Test.class ); suite.addTestSuite( MavenIT0095Test.class ); @@ -162,6 +162,7 @@ suite.addTestSuite( MavenITmng2254PomEncodingTest.class); suite.addTestSuite( MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.class ); suite.addTestSuite( MavenITmng2045testJarDependenciesBrokenInReactorTest.class); + suite.addTestSuite( MavenITmng2277AggregatorAndResolutionPluginsTest.class); // // Tests that need to be fixed. Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java?rev=589460view=auto == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java (added) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java Sun Oct 28 18:24:29 2007 @@ -0,0 +1,53 @@ +package org.apache.maven.integrationtests; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; + +/** + * @author a href=mailto:[EMAIL PROTECTED]Brian Fox/a + * + */ +public class MavenITmng2277AggregatorAndResolutionPluginsTest +extends AbstractMavenIntegrationTestCase
svn commit: r589261 - in /maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/m
Author: brianf Date: Sat Oct 27 19:16:30 2007 New Revision: 589261 URL: http://svn.apache.org/viewvc?rev=589261view=rev Log: adding new coreit plugin to consolidate some of the others. Added: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/ (with props) maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java Propchange: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/ -- --- svn:ignore (added) +++ svn:ignore Sat Oct 27 19:16:30 2007 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target Added: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml?rev=589261view=auto == --- maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml (added) +++ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/pom.xml Sat Oct 27 19:16:30 2007 @@ -0,0 +1,43 @@ +?xml version=1.0 encoding=UTF-8? + +!-- + ~ Copyright 2005-2006 The Apache Software Foundation. + ~ + ~ Licensed under the Apache License, Version 2.0 (the License); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an AS IS BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + -- + +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; + parent +artifactIdmaven-it-plugins/artifactId +groupIdorg.apache.maven.its.plugins/groupId +version2.1-SNAPSHOT/version + /parent + modelVersion4.0.0/modelVersion + artifactIdmaven-it-plugin-all/artifactId + packagingmaven-plugin/packaging + nameMaven Integration Test Plugin :: This plugin should contain the mojos needed by all tests./name + inceptionYear2007/inceptionYear + + properties +maven.test.skiptrue/maven.test.skip + /properties + + dependencies +dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-plugin-api/artifactId + version2.0/version +/dependency + /dependencies +/project Added: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java?rev=589261view=auto == --- maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java (added) +++ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java Sat Oct 27 19:16:30 2007 @@ -0,0 +1,22 @@ +package org.apache.maven.plugin.coreit; + +import org.apache.maven.plugin.AbstractMojo; +import
svn commit: r589262 - /maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml
Author: brianf Date: Sat Oct 27 19:16:49 2007 New Revision: 589262 URL: http://svn.apache.org/viewvc?rev=589262view=rev Log: adding new coreit plugin to consolidate some of the others. Modified: maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml Modified: maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml?rev=589262r1=589261r2=589262view=diff == --- maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml (original) +++ maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml Sat Oct 27 19:16:49 2007 @@ -21,7 +21,8 @@ modulemaven-it-plugin-parameter-implementation/module modulemaven-it-plugin-setter/module modulemaven-it-plugin-touch/module -modulemaven-it-plugin-uses-properties/module +modulemaven-it-plugin-uses-properties/module +modulemaven-it-plugin-all/module /modules build
svn commit: r588090 - in /maven/components/branches/maven-2.0.x/maven-project/src: main/java/org/apache/maven/project/inheritance/ test/java/org/apache/maven/project/inheritance/
Author: brianf
Date: Wed Oct 24 17:11:46 2007
New Revision: 588090
URL: http://svn.apache.org/viewvc?rev=588090view=rev
Log:
reverting MNG-3244. This caused MNG-3254
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=588090r1=588089r2=588090view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Wed Oct 24 17:11:46 2007
@@ -432,7 +432,7 @@
site.setUrl( parentDistMgmt.getSite().getUrl() );
-if ( site.getUrl() != null (site.getUrl().endsWith( /
)|| site.getUrl().endsWith( \\ )))
+if ( site.getUrl() != null )
{
site.setUrl(
appendPath( site.getUrl(), child.getArtifactId(),
childPathAdjustment, appendPaths ) );
@@ -494,30 +494,10 @@
if ( appendPaths )
{
if ( pathAdjustment != null )
-{
-if (uncleanPath.endsWith( / )|| uncleanPath.endsWith( \\ ))
-{
-uncleanPath += pathAdjustment;
-
-}
-else
-{
-uncleanPath += / + pathAdjustment;
-}
-}
+uncleanPath += / + pathAdjustment;
if ( childPath != null )
-{
-
-if (uncleanPath.endsWith( / )|| uncleanPath.endsWith( \\ ))
-{
-uncleanPath += childPath;
-}
-else
-{
-uncleanPath += / + childPath;
-}
-}
+uncleanPath += / + childPath;
}
String cleanedPath = ;
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=588090r1=588089r2=588090view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Wed Oct 24 17:11:46 2007
@@ -53,66 +53,6 @@
{
private ModelInheritanceAssembler assembler = new
DefaultModelInheritanceAssembler();
-public void
testSiteUrlWithTrailingForwardSlashInParentHasArtifactIdAppendedInChild()
-{
- Site site = new Site();
- site.setName(docs);
- site.setUrl(sftp://machine/path/to/site/;);
-
- DistributionManagement distributionManagement = new
DistributionManagement();
- distributionManagement.setSite(site);
-
- Model parent = makeBaseModel( parent );
- parent.setDistributionManagement(distributionManagement);
-
- Model child = makeBaseModel( child );
- child.setParent(parent.getParent());
-
- assembler.assembleModelInheritance(child, parent);
-
- assertEquals(site.getUrl()+ child,
child.getDistributionManagement().getSite().getUrl());
-}
-
-public void
testSiteUrlWithTrailingBackSlashInParentHasArtifactIdAppendedInChild()
-{
- Site site = new Site();
- site.setName(docs);
- site.setUrl(file://machine\\path\\to\\site\\);
-
- DistributionManagement distributionManagement = new
DistributionManagement();
- distributionManagement.setSite(site);
-
- Model parent = makeBaseModel( parent );
- parent.setDistributionManagement(distributionManagement);
-
- Model child = makeBaseModel( child );
- child.setParent(parent.getParent());
-
- assembler.assembleModelInheritance(child, parent);
-
- assertEquals(site.getUrl()+ child
svn commit: r587704 - /maven/components/branches/maven-2.0.x/pom.xml
Author: brianf Date: Tue Oct 23 17:06:04 2007 New Revision: 587704 URL: http://svn.apache.org/viewvc?rev=587704view=rev Log: need to bump the property first Modified: maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=587704r1=587703r2=587704view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Tue Oct 23 17:06:04 2007 @@ -131,7 +131,7 @@ /dependency /dependencies properties -mavenVersion2.0.8-SNAPSHOT/mavenVersion +mavenVersion2.0.8/mavenVersion /properties dependencyManagement dependencies
svn commit: r587705 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-
Author: brianf Date: Tue Oct 23 17:09:32 2007 New Revision: 587705 URL: http://svn.apache.org/viewvc?rev=587705view=rev Log: [maven-release-plugin] prepare release maven-2.0.8 Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=587705r1=587704r2=587705view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Tue Oct 23 17:09:32 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=587705r1=587704r2=587705view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Tue Oct 23 17:09:32 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=587705r1=587704r2=587705view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Tue Oct 23 17:09:32 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=587705r1=587704r2=587705view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Tue Oct 23 17:09:32 2007 @@ -24,7 +24,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml?rev=587705r1=587704r2=587705view=diff == --- maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml Tue Oct 23 17:09:32 2007 @@ -23,7 +23,7 @@ parent
svn commit: r587706 - in /maven/components/tags/maven-2.0.8: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-core/src/bin/ maven-core/src/main/java/org/apache/maven/c
Author: brianf Date: Tue Oct 23 17:09:52 2007 New Revision: 587706 URL: http://svn.apache.org/viewvc?rev=587706view=rev Log: [maven-release-plugin] copy for tag maven-2.0.8 Added: maven/components/tags/maven-2.0.8/ - copied from r587297, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.8/maven-artifact-manager/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.8/maven-artifact-test/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.8/maven-artifact/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.8/maven-core/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.8/maven-core/src/bin/mvnDebug - copied unchanged from r587358, maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug maven/components/tags/maven-2.0.8/maven-core/src/bin/mvnDebug.bat - copied unchanged from r587358, maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat maven/components/tags/maven-2.0.8/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java - copied unchanged from r587366, maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java maven/components/tags/maven-2.0.8/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java - copied unchanged from r587366, maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java maven/components/tags/maven-2.0.8/maven-error-diagnostics/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.8/maven-model/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.8/maven-monitor/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-api/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-descriptor/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-registry/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.8/maven-profile/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.8/maven-project/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.8/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java - copied unchanged from r587362, maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java maven/components/tags/maven-2.0.8/maven-project/src/main/java/org/apache/maven/project/MavenProject.java - copied unchanged from r587356, maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java maven/components/tags/maven-2.0.8/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.8/maven-reporting/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.8/maven-repository-metadata/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.8/maven-script/maven-script-ant/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.8/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.8/maven-script/pom.xml - copied unchanged from r587705, maven/components/branches/maven-2.0.x/maven-script/pom.xml
svn commit: r587716 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-
Author: brianf Date: Tue Oct 23 17:24:56 2007 New Revision: 587716 URL: http://svn.apache.org/viewvc?rev=587716view=rev Log: rolling back the abortion created by the release plugin Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=587716r1=587715r2=587716view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Tue Oct 23 17:24:56 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=587716r1=587715r2=587716view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Tue Oct 23 17:24:56 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=587716r1=587715r2=587716view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Tue Oct 23 17:24:56 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=587716r1=587715r2=587716view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Tue Oct 23 17:24:56 2007 @@ -24,7 +24,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml?rev=587716r1=587715r2=587716view=diff == --- maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml Tue Oct 23 17:24:56 2007 @@ -23,7 +23,7
svn commit: r587729 - /maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Author: brianf
Date: Tue Oct 23 18:07:14 2007
New Revision: 587729
URL: http://svn.apache.org/viewvc?rev=587729view=rev
Log:
MRELEASE-296 failing to update properties
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Modified:
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=587729r1=587728r2=587729view=diff
==
---
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
(original)
+++
maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
Tue Oct 23 18:07:14 2007
@@ -555,6 +555,12 @@
// change the property only if the
property is the same as what's in the reactor
property.setText( mappedVersion );
}
+else if ( mappedVersion.equals(
propertyValue ))
+{
+ //this property may have been
updated during processing a sibling.
+logInfo( result, Ignoring
artifact version update for expression: +
+ mappedVersion+ because
it is already updated. );
+}
else if ( !mappedVersion.equals(
versionText ) )
{
if ( mappedVersion.matches(
\\$\\{project.+\\} ) ||
svn commit: r587735 - in /maven/release/trunk: maven-release-manager/pom.xml maven-release-plugin/pom.xml pom.xml
Author: brianf Date: Tue Oct 23 18:16:22 2007 New Revision: 587735 URL: http://svn.apache.org/viewvc?rev=587735view=rev Log: [maven-release-plugin] prepare release maven-release-4 Modified: maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=587735r1=587734r2=587735view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Tue Oct 23 18:16:22 2007 @@ -23,10 +23,10 @@ parent groupIdorg.apache.maven.release/groupId artifactIdmaven-release/artifactId -version4-SNAPSHOT/version +version4/version /parent artifactIdmaven-release-manager/artifactId - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-4/version prerequisites maven2.0.1/maven /prerequisites Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=587735r1=587734r2=587735view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Tue Oct 23 18:16:22 2007 @@ -22,14 +22,14 @@ parent groupIdorg.apache.maven.release/groupId artifactIdmaven-release/artifactId -version4-SNAPSHOT/version +version4/version /parent modelVersion4.0.0/modelVersion groupIdorg.apache.maven.plugins/groupId artifactIdmaven-release-plugin/artifactId packagingmaven-plugin/packaging nameMaven Release Plugin/name - version2.0-beta-7-SNAPSHOT/version + version2.0-beta-7/version prerequisites maven2.0.1/maven /prerequisites @@ -46,7 +46,7 @@ dependency groupIdorg.apache.maven.release/groupId artifactIdmaven-release-manager/artifactId - version1.0-alpha-4-SNAPSHOT/version + version1.0-alpha-4/version exclusions exclusion groupIdorg.codehaus.plexus/groupId Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=587735r1=587734r2=587735view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Tue Oct 23 18:16:22 2007 @@ -28,7 +28,7 @@ /parent groupIdorg.apache.maven.release/groupId artifactIdmaven-release/artifactId - version4-SNAPSHOT/version + version4/version packagingpom/packaging nameMaven Release/name issueManagement @@ -40,9 +40,9 @@ modulemaven-release-plugin/module /modules scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/release/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/release/trunk/developerConnection -urlhttp://svn.apache.org/viewcvs.cgi/maven/release/trunk/url + connectionscm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-4/developerConnection + urlhttps://svn.apache.org/repos/asf/maven/release/tags/maven-release-4/url /scm build pluginManagement
svn commit: r587736 - in /maven/release/tags/maven-release-4: ./ maven-release-manager/pom.xml maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java m
Author: brianf Date: Tue Oct 23 18:16:29 2007 New Revision: 587736 URL: http://svn.apache.org/viewvc?rev=587736view=rev Log: [maven-scm] copy for tag maven-release-4 Added: maven/release/tags/maven-release-4/ - copied from r587717, maven/release/trunk/ maven/release/tags/maven-release-4/maven-release-manager/pom.xml - copied unchanged from r587735, maven/release/trunk/maven-release-manager/pom.xml maven/release/tags/maven-release-4/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java - copied unchanged from r587729, maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java maven/release/tags/maven-release-4/maven-release-plugin/pom.xml - copied unchanged from r587735, maven/release/trunk/maven-release-plugin/pom.xml maven/release/tags/maven-release-4/pom.xml - copied unchanged from r587735, maven/release/trunk/pom.xml
svn commit: r587737 - in /maven/release/trunk: maven-release-manager/pom.xml maven-release-plugin/pom.xml pom.xml
Author: brianf Date: Tue Oct 23 18:16:36 2007 New Revision: 587737 URL: http://svn.apache.org/viewvc?rev=587737view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/release/trunk/maven-release-manager/pom.xml maven/release/trunk/maven-release-plugin/pom.xml maven/release/trunk/pom.xml Modified: maven/release/trunk/maven-release-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=587737r1=587736r2=587737view=diff == --- maven/release/trunk/maven-release-manager/pom.xml (original) +++ maven/release/trunk/maven-release-manager/pom.xml Tue Oct 23 18:16:36 2007 @@ -23,10 +23,10 @@ parent groupIdorg.apache.maven.release/groupId artifactIdmaven-release/artifactId -version4/version +version5-SNAPSHOT/version /parent artifactIdmaven-release-manager/artifactId - version1.0-alpha-4/version + version1.0-alpha-5-SNAPSHOT/version prerequisites maven2.0.1/maven /prerequisites Modified: maven/release/trunk/maven-release-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/pom.xml?rev=587737r1=587736r2=587737view=diff == --- maven/release/trunk/maven-release-plugin/pom.xml (original) +++ maven/release/trunk/maven-release-plugin/pom.xml Tue Oct 23 18:16:36 2007 @@ -22,14 +22,14 @@ parent groupIdorg.apache.maven.release/groupId artifactIdmaven-release/artifactId -version4/version +version5-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion groupIdorg.apache.maven.plugins/groupId artifactIdmaven-release-plugin/artifactId packagingmaven-plugin/packaging nameMaven Release Plugin/name - version2.0-beta-7/version + version2.0-beta-8-SNAPSHOT/version prerequisites maven2.0.1/maven /prerequisites Modified: maven/release/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=587737r1=587736r2=587737view=diff == --- maven/release/trunk/pom.xml (original) +++ maven/release/trunk/pom.xml Tue Oct 23 18:16:36 2007 @@ -28,7 +28,7 @@ /parent groupIdorg.apache.maven.release/groupId artifactIdmaven-release/artifactId - version4/version + version5-SNAPSHOT/version packagingpom/packaging nameMaven Release/name issueManagement @@ -40,9 +40,9 @@ modulemaven-release-plugin/module /modules scm - connectionscm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/release/tags/maven-release-4/developerConnection - urlhttps://svn.apache.org/repos/asf/maven/release/tags/maven-release-4/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/release/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/release/trunk/developerConnection +urlhttp://svn.apache.org/viewcvs.cgi/maven/release/trunk/url /scm build pluginManagement
svn commit: r587739 - /maven/components/branches/maven-2.0.x/pom.xml
Author: brianf Date: Tue Oct 23 18:26:48 2007 New Revision: 587739 URL: http://svn.apache.org/viewvc?rev=587739view=rev Log: checking the new version. will rollback shortly Modified: maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=587739r1=587738r2=587739view=diff == --- maven/components/branches/maven-2.0.x/pom.xml (original) +++ maven/components/branches/maven-2.0.x/pom.xml Tue Oct 23 18:26:48 2007 @@ -72,7 +72,7 @@ /plugin plugin artifactIdmaven-release-plugin/artifactId - version2.0-beta-5/version + version2.0-beta-7/version configuration tagBasehttps://svn.apache.org/repos/asf/maven/components/tags/tagBase /configuration
svn commit: r587740 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-
Author: brianf Date: Tue Oct 23 18:33:15 2007 New Revision: 587740 URL: http://svn.apache.org/viewvc?rev=587740view=rev Log: [maven-release-plugin] prepare release maven-2.0.8 Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=587740r1=587739r2=587740view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Tue Oct 23 18:33:15 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=587740r1=587739r2=587740view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Tue Oct 23 18:33:15 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=587740r1=587739r2=587740view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Tue Oct 23 18:33:15 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=587740r1=587739r2=587740view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Tue Oct 23 18:33:15 2007 @@ -24,7 +24,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.8-SNAPSHOT/version +version2.0.8/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml?rev=587740r1=587739r2=587740view=diff == --- maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml Tue Oct 23 18:33:15 2007 @@ -23,7 +23,7 @@ parent
svn commit: r587741 - in /maven/components/tags/maven-2.0.8: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-core/src/bin/ maven-core/src/main/java/org/apache/maven/c
Author: brianf Date: Tue Oct 23 18:33:40 2007 New Revision: 587741 URL: http://svn.apache.org/viewvc?rev=587741view=rev Log: [maven-release-plugin] copy for tag maven-2.0.8 Added: maven/components/tags/maven-2.0.8/ - copied from r587297, maven/components/branches/maven-2.0.x/ maven/components/tags/maven-2.0.8/maven-artifact-manager/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/tags/maven-2.0.8/maven-artifact-test/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/tags/maven-2.0.8/maven-artifact/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/tags/maven-2.0.8/maven-core/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/tags/maven-2.0.8/maven-core/src/bin/mvnDebug - copied unchanged from r587358, maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug maven/components/tags/maven-2.0.8/maven-core/src/bin/mvnDebug.bat - copied unchanged from r587358, maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat maven/components/tags/maven-2.0.8/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java - copied unchanged from r587366, maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java maven/components/tags/maven-2.0.8/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java - copied unchanged from r587366, maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java maven/components/tags/maven-2.0.8/maven-error-diagnostics/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.0.8/maven-model/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/tags/maven-2.0.8/maven-monitor/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-api/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-descriptor/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.0.8/maven-plugin-registry/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/tags/maven-2.0.8/maven-profile/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/tags/maven-2.0.8/maven-project/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/tags/maven-2.0.8/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java - copied unchanged from r587362, maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java maven/components/tags/maven-2.0.8/maven-project/src/main/java/org/apache/maven/project/MavenProject.java - copied unchanged from r587356, maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java maven/components/tags/maven-2.0.8/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.0.8/maven-reporting/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/tags/maven-2.0.8/maven-repository-metadata/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/tags/maven-2.0.8/maven-script/maven-script-ant/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.0.8/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.0.8/maven-script/pom.xml - copied unchanged from r587740, maven/components/branches/maven-2.0.x/maven-script/pom.xml
svn commit: r587744 - in /maven/components/branches/maven-2.0.x: ./ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ maven-monitor/ maven-
Author: brianf Date: Tue Oct 23 18:36:19 2007 New Revision: 587744 URL: http://svn.apache.org/viewvc?rev=587744view=rev Log: rolling back successfull test Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml maven/components/branches/maven-2.0.x/maven-artifact/pom.xml maven/components/branches/maven-2.0.x/maven-core/pom.xml maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.0.x/maven-model/pom.xml maven/components/branches/maven-2.0.x/maven-monitor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-api/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.0.x/maven-plugin-registry/pom.xml maven/components/branches/maven-2.0.x/maven-profile/pom.xml maven/components/branches/maven-2.0.x/maven-project/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.0.x/maven-reporting/pom.xml maven/components/branches/maven-2.0.x/maven-repository-metadata/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.0.x/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.0.x/maven-script/pom.xml maven/components/branches/maven-2.0.x/maven-settings/pom.xml maven/components/branches/maven-2.0.x/pom.xml Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml?rev=587744r1=587743r2=587744view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-manager/pom.xml Tue Oct 23 18:36:19 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-manager/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml?rev=587744r1=587743r2=587744view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact-test/pom.xml Tue Oct 23 18:36:19 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact-test/artifactId Modified: maven/components/branches/maven-2.0.x/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/pom.xml?rev=587744r1=587743r2=587744view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/pom.xml Tue Oct 23 18:36:19 2007 @@ -23,7 +23,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-artifact/artifactId Modified: maven/components/branches/maven-2.0.x/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/pom.xml?rev=587744r1=587743r2=587744view=diff == --- maven/components/branches/maven-2.0.x/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-core/pom.xml Tue Oct 23 18:36:19 2007 @@ -24,7 +24,7 @@ parent artifactIdmaven/artifactId groupIdorg.apache.maven/groupId -version2.0.9-SNAPSHOT/version +version2.0.8-SNAPSHOT/version /parent modelVersion4.0.0/modelVersion artifactIdmaven-core/artifactId Modified: maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml?rev=587744r1=587743r2=587744view=diff == --- maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml (original) +++ maven/components/branches/maven-2.0.x/maven-error-diagnostics/pom.xml Tue Oct 23 18:36:19 2007 @@ -23,7 +23,7
svn commit: r587331 - in /maven/components/branches/maven-2.0.x: maven-core/src/main/java/org/apache/maven/cli/MavenCli.java pom.xml
Author: brianf
Date: Mon Oct 22 17:28:38 2007
New Revision: 587331
URL: http://svn.apache.org/viewvc?rev=587331view=rev
Log:
use new OS tools for the version info.
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.0.x/pom.xml
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=587331r1=587330r2=587331view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Mon Oct 22 17:28:38 2007
@@ -19,6 +19,15 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
@@ -54,17 +63,9 @@
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;
+import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
/**
* @author a href=mailto:[EMAIL PROTECTED]Jason van Zyl/a
* @version $Id$
@@ -73,14 +74,7 @@
public class MavenCli
{
private static Embedder embedder;
-
-public static final String OS_NAME = System.getProperty( os.name
).toLowerCase( Locale.US );
-
-public static final String OS_ARCH = System.getProperty( os.arch
).toLowerCase( Locale.US );
-
-public static final String OS_VERSION = System.getProperty( os.version
).toLowerCase( Locale.US );
-
-
+
/**
* @noinspection ConfusingMainMethod
*/
@@ -545,13 +539,8 @@
System.out.println( Java version: + System.getProperty(
java.version, unknown java version ) );
-/*
- * TODO: when plexus can return the family type, add that here
- * because it will make it easier to know what profile activation
- * settings to use
- */
-System.out.println( OS name: \ + OS_NAME + \ version: \ +
OS_VERSION + \ arch: \ + OS_ARCH
-+ \ );
+System.out.println( OS name: \ + Os.OS_NAME + \ version: \
+ Os.OS_VERSION +
+\ arch: \ + Os.OS_ARCH + \ Family: \ +
Os.OS_FAMILY + \ );
}
catch ( IOException e )
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=587331r1=587330r2=587331view=diff
==
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Mon Oct 22 17:28:38 2007
@@ -220,7 +220,7 @@
dependency
groupIdorg.codehaus.plexus/groupId
artifactIdplexus-utils/artifactId
-version1.4.5/version
+version1.4.6/version
/dependency
dependency
groupIdorg.apache.maven.wagon/groupId
svn commit: r587340 - /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Author: brianf
Date: Mon Oct 22 17:50:22 2007
New Revision: 587340
URL: http://svn.apache.org/viewvc?rev=587340view=rev
Log:
MNG-2166: enhanced missing goal error info
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=587340r1=587339r2=587340view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Mon Oct 22 17:50:22 2007
@@ -19,6 +19,17 @@
* under the License.
*/
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.StringTokenizer;
+
+import org.apache.commons.cli.HelpFormatter;
import org.apache.maven.BuildFailureException;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -62,16 +73,6 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.StringTokenizer;
-
/**
* @author a href=mailto:[EMAIL PROTECTED]Jason van Zyl/a
* @author a href=mailto:[EMAIL PROTECTED]Brett Porter/a
@@ -132,7 +133,7 @@
if ( goals.isEmpty() )
{
-throw new BuildFailureException( You must specify at least one
goal. Try 'install' );
+throw new BuildFailureException( \n\nYou must specify at least
one goal. Try 'mvn install' to build or 'mvn -?' for options \nSee
http://maven.apache.org for more information.\n\n );
}
List taskSegments = segmentTaskListByAggregationNeeds( goals, session,
rootProject );
svn commit: r587349 - in /maven/components/branches/maven-2.0.x/maven-core/src/bin: mvnDebug mvnDebug.bat
Author: brianf
Date: Mon Oct 22 18:17:11 2007
New Revision: 587349
URL: http://svn.apache.org/viewvc?rev=587349view=rev
Log:
MNG-2105: add debug scripts
Added:
maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug
maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat
Added: maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug?rev=587349view=auto
==
--- maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug (added)
+++ maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug Mon Oct
22 18:17:11 2007
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# License); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+#http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# --
+# JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -
+# M2_HOME - location of maven2's installed home dir
+# MAVEN_OPTS - parameters passed to the Java VM when running Maven
+# e.g. to debug Maven itself, use
+# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#
+
+ORIG_MAVEN_OPTS=$MAVEN_OPTS
+MAVEN_OPTS=$ORIG_MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+
+echo Preparing to Execute Maven in Debug Mode
+
+QUOTED_ARGS=
+while [ $1 != ] ; do
+
+ QUOTED_ARGS=$QUOTED_ARGS \$1\
+ shift
+
+done
+
+if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+fi
+
+if [ -f $HOME/.mavenrc ] ; then
+ . $HOME/.mavenrc
+fi
+
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case `uname` in
+ CYGWIN*) cygwin=true ;;
+ MINGW*) mingw=true;;
+ Darwin*) darwin=true
+ if [ -z $JAVA_VERSION ] ; then
+ JAVA_VERSION=CurrentJDK
+ else
+ echo Using Java version: $JAVA_VERSION
+ fi
+ if [ -z $JAVA_HOME ] ; then
+
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
+esac
+
+if [ -z $JAVA_HOME ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+if [ -z $M2_HOME ] ; then
+ ## resolve links - $0 may be a link to maven's home
+ PRG=$0
+
+ # need this for relative symlinks
+ while [ -h $PRG ] ; do
+ls=`ls -ld $PRG`
+link=`expr $ls : '.*- \(.*\)$'`
+if expr $link : '/.*' /dev/null; then
+ PRG=$link
+else
+ PRG=`dirname $PRG`/$link
+fi
+ done
+
+ saveddir=`pwd`
+
+ M2_HOME=`dirname $PRG`/..
+
+ # make it fully qualified
+ M2_HOME=`cd $M2_HOME pwd`
+
+ cd $saveddir
+ # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n $M2_HOME ]
+M2_HOME=`cygpath --unix $M2_HOME`
+ [ -n $JAVA_HOME ]
+JAVA_HOME=`cygpath --unix $JAVA_HOME`
+ [ -n $CLASSPATH ]
+CLASSPATH=`cygpath --path --unix $CLASSPATH`
+fi
+
+# For Migwn, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+ [ -n $M2_HOME ]
+M2_HOME=`(cd $M2_HOME; pwd)`
+ [ -n $JAVA_HOME ]
+JAVA_HOME=`(cd $JAVA_HOME; pwd)`
+ # TODO classpath?
+fi
+
+if [ -z $JAVACMD ] ; then
+ if [ -n $JAVA_HOME ] ; then
+if [ -x $JAVA_HOME/jre/sh/java ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+else
+ JAVACMD=$JAVA_HOME/bin/java
+fi
+ else
+JAVACMD=java
+ fi
+fi
+
+if [ ! -x $JAVACMD ] ; then
+ echo Error: JAVA_HOME is not defined correctly.
+ echo We cannot execute $JAVACMD
+ exit 1
+fi
+
+if [ -z $JAVA_HOME ] ; then
+ echo Warning: JAVA_HOME environment variable
svn commit: r587356 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: brianf
Date: Mon Oct 22 18:39:06 2007
New Revision: 587356
URL: http://svn.apache.org/viewvc?rev=587356view=rev
Log:
MNG-3201: added toString()
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=587356r1=587355r2=587356view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Mon Oct 22 18:39:06 2007
@@ -1711,4 +1711,30 @@
}
}
+/**
+ * Default toString
+ */
+public String toString()
+{
+StringBuffer sb = new StringBuffer(30);
+sb.append( MavenProject: );
+sb.append( this.getGroupId() );
+sb.append( : );
+sb.append( this.getArtifactId() );
+sb.append( : );
+sb.append( this.getVersion() );
+sb.append( @ );
+
+try
+{
+sb.append( this.getFile().getPath() );
+}
+catch (NullPointerException e)
+{
+//don't log it.
+}
+
+return sb.toString();
+}
+
}
svn commit: r587358 - in /maven/components/branches/maven-2.0.x/maven-core/src/bin: mvnDebug mvnDebug.bat
Author: brianf
Date: Mon Oct 22 18:49:25 2007
New Revision: 587358
URL: http://svn.apache.org/viewvc?rev=587358view=rev
Log:
more reliable debug scripts. these don't change the eternal values so that
terminated scripts won't cause problems.
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug
maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat
Modified: maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug?rev=587358r1=587357r2=587358view=diff
==
--- maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug Mon Oct
22 18:49:25 2007
@@ -33,8 +33,7 @@
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
#
-ORIG_MAVEN_OPTS=$MAVEN_OPTS
-MAVEN_OPTS=$ORIG_MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+INT_MAVEN_OPTS=$MAVEN_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
echo Preparing to Execute Maven in Debug Mode
@@ -160,10 +159,9 @@
fi
exec $JAVACMD \
- $MAVEN_OPTS \
+ $INT_MAVEN_OPTS \
-classpath ${M2_HOME}/boot/classworlds-*.jar \
-Dclassworlds.conf=${M2_HOME}/bin/m2.conf \
-Dmaven.home=${M2_HOME} \
${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS
- MAVEN_OPTS=$ORIG_MAVEN_OPTS
Modified: maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat?rev=587358r1=587357r2=587358view=diff
==
--- maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat
(original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/bin/mvnDebug.bat Mon
Oct 22 18:49:25 2007
@@ -32,8 +32,7 @@
@REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@REM
-set ORIG_MAVEN_OPTS=%MAVEN_OPTS%
-set MAVEN_OPTS=%ORIG_MAVEN_OPTS% -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+set INT_MAVEN_OPTS=%MAVEN_OPTS% -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@echo Preparing to Execute Maven in Debug Mode
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@@ -145,7 +144,7 @@
@REM Start MAVEN2
:runm2
-%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
-Dclassworlds.conf=%M2_HOME%\bin\m2.conf -Dmaven.home=%M2_HOME%
org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
+%MAVEN_JAVA_EXE% %INT_MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
-Dclassworlds.conf=%M2_HOME%\bin\m2.conf -Dmaven.home=%M2_HOME%
org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
if ERRORLEVEL 1 goto error
goto end
@@ -172,6 +171,6 @@
if %MAVEN_BATCH_PAUSE% == on pause
if %MAVEN_TERMINATE_CMD% == on exit %ERROR_CODE%
-set MAVEN_OPTS=%ORIG_MAVEN_OPTS%
+
exit /B %ERROR_CODE%
svn commit: r587362 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java
Author: brianf Date: Mon Oct 22 19:23:53 2007 New Revision: 587362 URL: http://svn.apache.org/viewvc?rev=587362view=rev Log: unused import Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java?rev=587362r1=587361r2=587362view=diff == --- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java (original) +++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/ProfileManager.java Mon Oct 22 19:23:53 2007 @@ -19,7 +19,6 @@ * under the License. */ -import java.util.Properties; import org.apache.maven.model.Profile; import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.settings.Settings;
svn commit: r587366 - in /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven: cli/MavenCli.java lifecycle/DefaultLifecycleExecutor.java
Author: brianf
Date: Mon Oct 22 19:36:01 2007
New Revision: 587366
URL: http://svn.apache.org/viewvc?rev=587366view=rev
Log:
unused imports
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=587366r1=587365r2=587366view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Mon Oct 22 19:36:01 2007
@@ -24,7 +24,6 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
import java.util.Properties;
import java.util.StringTokenizer;
@@ -213,14 +212,14 @@
// TODO:Additionally, we can't change the mojo level because
the component key includes the version and it isn't known ahead of time. This
seems worth changing.
}
-ProfileManager profileManager = new DefaultProfileManager(
embedder.getContainer() );
+ProfileManager profileManager = new DefaultProfileManager(
embedder.getContainer(),System.getProperties() );
if ( commandLine.hasOption( CLIManager.ACTIVATE_PROFILES ) )
{
String profilesLine = commandLine.getOptionValue(
CLIManager.ACTIVATE_PROFILES );
StringTokenizer profileTokens = new StringTokenizer(
profilesLine, , );
-
+
while ( profileTokens.hasMoreTokens() )
{
String profileAction = profileTokens.nextToken().trim();
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=587366r1=587365r2=587366view=diff
==
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Mon Oct 22 19:36:01 2007
@@ -29,7 +29,6 @@
import java.util.Stack;
import java.util.StringTokenizer;
-import org.apache.commons.cli.HelpFormatter;
import org.apache.maven.BuildFailureException;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
svn commit: r585548 - in /maven/components/trunk/maven-project/src/test: java/org/apache/maven/project/MavenProjectTest.java resources/iso-8859-15-encoded-pom.xml resources/utf-8-encoded-pom.xml
Author: brianf
Date: Wed Oct 17 09:01:23 2007
New Revision: 585548
URL: http://svn.apache.org/viewvc?rev=585548view=rev
Log:
rolling back broken tests
Removed:
maven/components/trunk/maven-project/src/test/resources/iso-8859-15-encoded-pom.xml
maven/components/trunk/maven-project/src/test/resources/utf-8-encoded-pom.xml
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=585548r1=585547r2=585548view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Wed Oct 17 09:01:23 2007
@@ -156,30 +156,4 @@
MavenProject clonedProject = new MavenProject( projectToClone );
assertNotNull( clonedProject - distributionManagement,
clonedProject.getDistributionManagementArtifactRepository() );
}
-
-
- /**
-*
-* Maven uses FileReaders by default to read POMs.
-* @throws Exception
-*/
-public void testUTF8EncodedProject() throws Exception
-{
- File f = getFileForClasspathResource( utf-8-encoded-pom.xml );
- MavenProject utf8EncodedProject = getProject( f );
-
- assertEquals( öäüß, utf8EncodedProject.getDescription() );
-}
-
- /**
-* This test case will not fail, because 8bit encodings won't corrupt
the parser.
-* @throws Exception
-*/
-public void testISOEncodedProject() throws Exception
-{
- File f = getFileForClasspathResource(
iso-8859-15-encoded-pom.xml );
- MavenProject isoEncodedProject = getProject( f );
-
- assertEquals( öäüß, isoEncodedProject.getDescription() );
-}
}
svn commit: r585812 - in /maven/components/branches/maven-2.0.x/maven-project/src: main/java/org/apache/maven/project/inheritance/ test/java/org/apache/maven/project/inheritance/
Author: brianf
Date: Wed Oct 17 20:11:42 2007
New Revision: 585812
URL: http://svn.apache.org/viewvc?rev=585812view=rev
Log:
MNG-3244: fix site url inheritence, patch from James Dumay
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=585812r1=585811r2=585812view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
Wed Oct 17 20:11:42 2007
@@ -432,7 +432,7 @@
site.setUrl( parentDistMgmt.getSite().getUrl() );
-if ( site.getUrl() != null )
+if ( site.getUrl() != null (site.getUrl().endsWith( /
)|| site.getUrl().endsWith( \\ )))
{
site.setUrl(
appendPath( site.getUrl(), child.getArtifactId(),
childPathAdjustment, appendPaths ) );
@@ -494,10 +494,30 @@
if ( appendPaths )
{
if ( pathAdjustment != null )
-uncleanPath += / + pathAdjustment;
+{
+if (uncleanPath.endsWith( / )|| uncleanPath.endsWith( \\ ))
+{
+uncleanPath += pathAdjustment;
+
+}
+else
+{
+uncleanPath += / + pathAdjustment;
+}
+}
if ( childPath != null )
-uncleanPath += / + childPath;
+{
+
+if (uncleanPath.endsWith( / )|| uncleanPath.endsWith( \\ ))
+{
+uncleanPath += childPath;
+}
+else
+{
+uncleanPath += / + childPath;
+}
+}
}
String cleanedPath = ;
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java?rev=585812r1=585811r2=585812view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
Wed Oct 17 20:11:42 2007
@@ -53,6 +53,66 @@
{
private ModelInheritanceAssembler assembler = new
DefaultModelInheritanceAssembler();
+public void
testSiteUrlWithTrailingForwardSlashInParentHasArtifactIdAppendedInChild()
+{
+ Site site = new Site();
+ site.setName(docs);
+ site.setUrl(sftp://machine/path/to/site/;);
+
+ DistributionManagement distributionManagement = new
DistributionManagement();
+ distributionManagement.setSite(site);
+
+ Model parent = makeBaseModel( parent );
+ parent.setDistributionManagement(distributionManagement);
+
+ Model child = makeBaseModel( child );
+ child.setParent(parent.getParent());
+
+ assembler.assembleModelInheritance(child, parent);
+
+ assertEquals(site.getUrl()+ child,
child.getDistributionManagement().getSite().getUrl());
+}
+
+public void
testSiteUrlWithTrailingBackSlashInParentHasArtifactIdAppendedInChild()
+{
+ Site site = new Site();
+ site.setName(docs);
+ site.setUrl(file://machine\\path\\to\\site\\);
+
+ DistributionManagement distributionManagement = new
DistributionManagement();
+ distributionManagement.setSite(site);
+
+ Model parent = makeBaseModel( parent );
+ parent.setDistributionManagement(distributionManagement);
+
+ Model child = makeBaseModel( child );
+ child.setParent(parent.getParent());
+
+ assembler.assembleModelInheritance(child, parent);
+
+ assertEquals
svn commit: r585307 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: brianf
Date: Tue Oct 16 17:49:21 2007
New Revision: 585307
URL: http://svn.apache.org/viewvc?rev=585307view=rev
Log:
MNG2045 applying patch from Paul Gier to fix test jar dependencies from sibling
projects.
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=585307r1=585306r2=585307view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Tue Oct 16 17:49:21 2007
@@ -1681,11 +1681,26 @@
{
String refId = getProjectReferenceId( a.getGroupId(),
a.getArtifactId(), a.getVersion() );
MavenProject project = (MavenProject) projectReferences.get( refId );
+
+boolean projectDirFound = false;
if ( project != null )
{
-list.add( project.getBuild().getOutputDirectory() );
+if (a.getType().equals(test-jar))
+{
+File testOutputDir = new File(
project.getBuild().getTestOutputDirectory() );
+if ( testOutputDir.exists() )
+{
+list.add( testOutputDir.getAbsolutePath() );
+projectDirFound = true;
+}
+}
+else
+{
+list.add( project.getBuild().getOutputDirectory() );
+projectDirFound = true;
+}
}
-else
+if ( ! projectDirFound )
{
File file = a.getFile();
if ( file == null )
@@ -1695,4 +1710,5 @@
list.add( file.getPath() );
}
}
+
}
svn commit: r585311 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/mng-2045-testJarDependenciesBrokenInReactor/ resources
Author: brianf Date: Tue Oct 16 18:02:37 2007 New Revision: 585311 URL: http://svn.apache.org/viewvc?rev=585311view=rev Log: MNG2045: core it test Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2045testJarDependenciesBrokenInReactorTest.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/test/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/test/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/test/java/com/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/test/java/com/mycompany/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/test/java/com/mycompany/app/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/first-project/src/test/java/com/mycompany/app/SomeGeneralTestClass.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/main/java/com/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/main/java/com/somecompany/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/main/java/com/somecompany/OtherAppRequiringGeneralTestClass.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/test/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2045-testJarDependenciesBrokenInReactor/second-project/src/test/java/ Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=585311r1=585310r2=585311view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Tue Oct 16 18:02:37 2007 @@ -160,6 +160,7 @@ suite.addTestSuite( MavenIT0114ExtensionThatProvidesResources.class ); suite.addTestSuite
svn commit: r585316 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: brianf
Date: Tue Oct 16 18:30:12 2007
New Revision: 585316
URL: http://svn.apache.org/viewvc?rev=585316view=rev
Log:
MNG2045 applying patch from Paul Gier to fix test jar dependencies from sibling
projects.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=585316r1=585315r2=585316view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Tue Oct 16 18:30:12 2007
@@ -1707,15 +1707,30 @@
return pluginArtifact;
}
-private void addArtifactPath(Artifact a, List list) throws
DependencyResolutionRequiredException
+ private void addArtifactPath(Artifact a, List list) throws
DependencyResolutionRequiredException
{
String refId = getProjectReferenceId( a.getGroupId(),
a.getArtifactId(), a.getVersion() );
MavenProject project = (MavenProject) projectReferences.get( refId );
+
+boolean projectDirFound = false;
if ( project != null )
{
-list.add( project.getBuild().getOutputDirectory() );
+if (a.getType().equals(test-jar))
+{
+File testOutputDir = new File(
project.getBuild().getTestOutputDirectory() );
+if ( testOutputDir.exists() )
+{
+list.add( testOutputDir.getAbsolutePath() );
+projectDirFound = true;
+}
+}
+else
+{
+list.add( project.getBuild().getOutputDirectory() );
+projectDirFound = true;
+}
}
-else
+if ( ! projectDirFound )
{
File file = a.getFile();
if ( file == null )
@@ -1725,7 +1740,7 @@
list.add( file.getPath() );
}
}
-
+
public void clearExecutionProject()
{
if ( !previousExecutionProjects.isEmpty() )
svn commit: r585319 - in /maven/components/branches/maven-2.0.x/maven-project/src/test: java/org/apache/maven/project/MavenProjectTest.java resources/iso-8859-15-encoded-pom.xml resources/utf-8-encode
Author: brianf
Date: Tue Oct 16 18:40:02 2007
New Revision: 585319
URL: http://svn.apache.org/viewvc?rev=585319view=rev
Log:
MNG2025 patch to add encoding unit tests
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/iso-8859-15-encoded-pom.xml
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/utf-8-encoded-pom.xml
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=585319r1=585318r2=585319view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Tue Oct 16 18:40:02 2007
@@ -155,4 +155,29 @@
MavenProject clonedProject = new MavenProject( projectToClone );
assertNotNull( clonedProject - distributionManagement,
clonedProject.getDistributionManagementArtifactRepository() );
}
+
+ /**
+*
+* Maven uses FileReaders by default to read POMs.
+* @throws Exception
+*/
+public void testUTF8EncodedProject() throws Exception
+{
+ File f = getFileForClasspathResource( utf-8-encoded-pom.xml );
+ MavenProject utf8EncodedProject = getProject( f );
+
+ assertEquals( öäüß, utf8EncodedProject.getDescription() );
+}
+
+ /**
+* This test case will not fail, because 8bit encodings won't corrupt
the parser.
+* @throws Exception
+*/
+public void testISOEncodedProject() throws Exception
+{
+ File f = getFileForClasspathResource(
iso-8859-15-encoded-pom.xml );
+ MavenProject isoEncodedProject = getProject( f );
+
+ assertEquals( öäüß, isoEncodedProject.getDescription() );
+}
}
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/iso-8859-15-encoded-pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/iso-8859-15-encoded-pom.xml?rev=585319view=auto
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/iso-8859-15-encoded-pom.xml
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/iso-8859-15-encoded-pom.xml
Tue Oct 16 18:40:02 2007
@@ -0,0 +1,33 @@
+?xml version=1.0 encoding=ISO-8859-15?
+
+project
+ modelVersion4.0.0/modelVersion
+ groupIdmaven/groupId
+ artifactIdmaven-core/artifactId
+ nameMaven/name
+ version2.0-SNAPSHOT/version
+ descriptionöäüß/description
+ build
+plugins
+ plugin
+artifactIdmaven-plexus-plugin/artifactId
+version1.0/version
+configuration
+ plexusConfigurationsrc/conf/plexus.conf/plexusConfiguration
+
plexusConfigurationPropertiesFilesrc/conf/plexus.properties/plexusConfigurationPropertiesFile
+ plexusApplicationNameContinuum/plexusApplicationName
+/configuration
+executions
+ execution
+goals
+ goalplexus:runtime/goal
+/goals
+configuration
+ plexusApplicationNameContinuumPro/plexusApplicationName
+/configuration
+ /execution
+/executions
+ /plugin
+/plugins
+ /build
+/project
Added:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/utf-8-encoded-pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/resources/utf-8-encoded-pom.xml?rev=585319view=auto
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/utf-8-encoded-pom.xml
(added)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/utf-8-encoded-pom.xml
Tue Oct 16 18:40:02 2007
@@ -0,0 +1,33 @@
+?xml version=1.0 encoding=UTF-8?
+
+project
+ modelVersion4.0.0/modelVersion
+ groupIdmaven/groupId
+ artifactIdmaven-core/artifactId
+ nameMaven/name
+ version2.0-SNAPSHOT/version
+ descriptionöäüß/description
+ build
+plugins
+ plugin
+artifactIdmaven-plexus-plugin/artifactId
+version1.0/version
+configuration
+ plexusConfigurationsrc/conf/plexus.conf/plexusConfiguration
+
plexusConfigurationPropertiesFilesrc/conf/plexus.properties/plexusConfigurationPropertiesFile
svn commit: r585321 - in /maven/components/branches/maven-model-mng2025/src/test: ./ java/ java/org/ java/org/apache/ java/org/apache/maven/ java/org/apache/maven/model/ java/org/apache/maven/model/io
Author: brianf
Date: Tue Oct 16 18:48:14 2007
New Revision: 585321
URL: http://svn.apache.org/viewvc?rev=585321view=rev
Log:
MNG2025 patch to add encoding unit tests
Added:
maven/components/branches/maven-model-mng2025/src/test/
maven/components/branches/maven-model-mng2025/src/test/java/
maven/components/branches/maven-model-mng2025/src/test/java/org/
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/AbstractMavenModelTestCase.java
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderTest.java
maven/components/branches/maven-model-mng2025/src/test/resources/
maven/components/branches/maven-model-mng2025/src/test/resources/iso-8859-15-encoded-pom.xml
maven/components/branches/maven-model-mng2025/src/test/resources/utf-8-encoded-pom.xml
Added:
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/AbstractMavenModelTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/AbstractMavenModelTestCase.java?rev=585321view=auto
==
---
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/AbstractMavenModelTestCase.java
(added)
+++
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/AbstractMavenModelTestCase.java
Tue Oct 16 18:48:14 2007
@@ -0,0 +1,47 @@
+package org.apache.maven.model.io.xpp3;
+
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.net.URL;
+
+import junit.framework.TestCase;
+
+public abstract class AbstractMavenModelTestCase extends TestCase
+{
+protected File getFileForClasspathResource( String resource )
+throws FileNotFoundException
+{
+ClassLoader cloader = Thread.currentThread().getContextClassLoader();
+
+URL resourceUrl = cloader.getResource( resource );
+
+File resourceFile = null;
+if ( resourceUrl != null )
+{
+resourceFile = new File( resourceUrl.getPath() );
+}
+else
+{
+throw new FileNotFoundException( Unable to find: + resource );
+}
+
+return resourceFile;
+}
+}
Added:
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderTest.java?rev=585321view=auto
==
---
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderTest.java
(added)
+++
maven/components/branches/maven-model-mng2025/src/test/java/org/apache/maven/model/io/xpp3/MavenXpp3ReaderTest.java
Tue Oct 16 18:48:14 2007
@@ -0,0 +1,44 @@
+package org.apache.maven.model.io.xpp3;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.InputStreamReader;
+
+import org.apache.maven.model.Model;
+
+public class MavenXpp3ReaderTest extends AbstractMavenModelTestCase {
+
+ /**
+* This test case will not fail, because 8bit encodings won't corrupt
the parser.
+* @throws Exception
+*/
+ public void testISOEncodedModel() throws Exception {
+ File f = getFileForClasspathResource(
iso-8859-15-encoded-pom.xml );
+ MavenXpp3Reader reader = new MavenXpp3Reader();
+
+ Model model = reader.read( new InputStreamReader( new
FileInputStream( f ), ISO-8859-15 ) );
+ assertEquals( öäüß, model.getDescription() );
+
+ model = reader.read( new
svn commit: r585320 - /maven/components/branches/maven-model-mng2025/
Author: brianf Date: Tue Oct 16 18:47:48 2007 New Revision: 585320 URL: http://svn.apache.org/viewvc?rev=585320view=rev Log: made a copy Added: maven/components/branches/maven-model-mng2025/ - copied from r585319, maven/components/branches/maven-2.0.x/maven-model/
svn commit: r585328 - in /maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability: MojoExecutionExceptionDiagnoserTest.java MojoFailureExceptionDiagnoserTest.java
Author: brianf
Date: Tue Oct 16 19:14:11 2007
New Revision: 585328
URL: http://svn.apache.org/viewvc?rev=585328view=rev
Log:
added unit tests for MNG-3077
Added:
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
Added:
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java?rev=585328view=auto
==
---
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
(added)
+++
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoExecutionExceptionDiagnoserTest.java
Tue Oct 16 19:14:11 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.usability;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+import junit.framework.TestCase;
+
+/**
+ * @author a href=mailto:[EMAIL PROTECTED]Brian Fox/a
+ *
+ */
+public class MojoExecutionExceptionDiagnoserTest
+extends TestCase
+{
+
+public void testDiag()
+{
+MojoExecutionExceptionDiagnoser diag = new
MojoExecutionExceptionDiagnoser();
+
+Exception e = new NullPointerException(Test);
+
+assertFalse( diag.canDiagnose( e ) );
+
+MojoExecutionException me = new MojoExecutionException(null);
+
+assertTrue( diag.canDiagnose( me ) );
+
+diag.diagnose( me );
+
+}
+}
Added:
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java?rev=585328view=auto
==
---
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
(added)
+++
maven/components/branches/maven-2.0.x/maven-core/src/test/java/org/apache/maven/usability/MojoFailureExceptionDiagnoserTest.java
Tue Oct 16 19:14:11 2007
@@ -0,0 +1,30 @@
+package org.apache.maven.usability;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.plugin.MojoFailureException;
+
+/**
+ * @author a href=mailto:[EMAIL PROTECTED]Brian Fox/a
+ *
+ */
+public class MojoFailureExceptionDiagnoserTest
+extends TestCase
+{
+
+public void testDiag()
+{
+MojoFailureExceptionDiagnoser diag = new
MojoFailureExceptionDiagnoser();
+
+Exception e = new NullPointerException(Test);
+
+assertFalse( diag.canDiagnose( e ) );
+
+MojoFailureException me = new MojoFailureException(null);
+
+assertTrue( diag.canDiagnose( me ) );
+
+diag.diagnose( me );
+
+}
+}
svn commit: r585333 - in /maven/components/branches/maven-2.0.x/maven-artifact/src: main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java test/java/org/apache/maven/art
Author: brianf Date: Tue Oct 16 19:36:31 2007 New Revision: 585333 URL: http://svn.apache.org/viewvc?rev=585333view=rev Log: MNG-3024: put command on single line Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java?rev=585333r1=585332r2=585333view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java Tue Oct 16 19:36:31 2007 @@ -243,11 +243,7 @@ sb.append( groupId ); sb.append( -DartifactId= ); sb.append( artifactId ); -sb.append( \\); -sb.append( LS ); -sb.append( indentation ); -sb.append( ); -sb.append( -Dversion= ); +sb.append( -Dversion= ); sb.append( version ); //insert classifier only if it was used in the artifact @@ -272,11 +268,7 @@ sb.append( groupId ); sb.append( -DartifactId= ); sb.append( artifactId ); -sb.append( \\); -sb.append( LS ); -sb.append( indentation ); -sb.append( ); -sb.append( -Dversion= ); +sb.append( -Dversion= ); sb.append( version ); //insert classifier only if it was used in the artifact @@ -288,10 +280,6 @@ sb.append( -Dpackaging= ); sb.append( type ); sb.append( -Dfile=/path/to/file ); -sb.append( \\); -sb.append( LS ); -sb.append( indentation ); -sb.append( ); sb.append( -Durl=[url] -DrepositoryId=[id] ); sb.append( LS ); Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java?rev=585333r1=585332r2=585333view=diff == --- maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java (original) +++ maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolutionExceptionTest.java Tue Oct 16 19:36:31 2007 @@ -51,13 +51,13 @@ http://somewhere.com/download; + LS + LS + Then, install it using the command: + LS + - mvn install:install-file -DgroupId=aGroupId -DartifactId=anArtifactId \\ + LS + - -Dversion=aVersion -Dclassifier=aClassifier -Dpackaging=jar -Dfile=/path/to/file + LS + + mvn install:install-file -DgroupId=aGroupId -DartifactId=anArtifactId -Dversion=aVersion + + -Dclassifier=aClassifier -Dpackaging=jar -Dfile=/path/to/file + LS + LS + Alternatively, if you host your own repository you can deploy the file there: + LS + - mvn deploy:deploy-file -DgroupId=aGroupId -DartifactId=anArtifactId \\ + LS + - -Dversion=aVersion -Dclassifier=aClassifier -Dpackaging=jar -Dfile=/path/to/file \\ + LS + - -Durl=[url] -DrepositoryId=[id] + LS + + mvn deploy:deploy-file -DgroupId=aGroupId -DartifactId=anArtifactId+ +-Dversion=aVersion -Dclassifier=aClassifier -Dpackaging=jar -Dfile=/path/to/file+ +-Durl=[url] -DrepositoryId=[id] + LS + LS + Path to dependency: + LS + \t1) dependency1 + LS +
svn commit: r585334 - in /maven/components/branches/maven-2.0.x/maven-project/src/test: java/org/apache/maven/project/MavenProjectTest.java resources/iso-8859-15-encoded-pom.xml resources/utf-8-encode
Author: brianf
Date: Tue Oct 16 19:52:22 2007
New Revision: 585334
URL: http://svn.apache.org/viewvc?rev=585334view=rev
Log:
rolling back broken tests
Removed:
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/iso-8859-15-encoded-pom.xml
maven/components/branches/maven-2.0.x/maven-project/src/test/resources/utf-8-encoded-pom.xml
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java?rev=585334r1=585333r2=585334view=diff
==
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/MavenProjectTest.java
Tue Oct 16 19:52:22 2007
@@ -155,29 +155,4 @@
MavenProject clonedProject = new MavenProject( projectToClone );
assertNotNull( clonedProject - distributionManagement,
clonedProject.getDistributionManagementArtifactRepository() );
}
-
- /**
-*
-* Maven uses FileReaders by default to read POMs.
-* @throws Exception
-*/
-public void testUTF8EncodedProject() throws Exception
-{
- File f = getFileForClasspathResource( utf-8-encoded-pom.xml );
- MavenProject utf8EncodedProject = getProject( f );
-
- assertEquals( öäüß, utf8EncodedProject.getDescription() );
-}
-
- /**
-* This test case will not fail, because 8bit encodings won't corrupt
the parser.
-* @throws Exception
-*/
-public void testISOEncodedProject() throws Exception
-{
- File f = getFileForClasspathResource(
iso-8859-15-encoded-pom.xml );
- MavenProject isoEncodedProject = getProject( f );
-
- assertEquals( öäüß, isoEncodedProject.getDescription() );
-}
}
svn commit: r584025 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/mng-2254-PomEncoding/ resources/mng-2254-PomEncoding/s
Author: brianf
Date: Thu Oct 11 19:06:25 2007
New Revision: 584025
URL: http://svn.apache.org/viewvc?rev=584025view=rev
Log:
core it for mng-2254
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/pom.xml
(with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/java/org/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/java/org/apache/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/java/org/apache/maven/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/java/org/apache/maven/integrationtests/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/resources/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/resources/mng-2254-PomEncoding/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2254-PomEncoding/src/test/resources/mng-2254-PomEncoding/pom.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=584025r1=584024r2=584025view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Thu Oct 11 19:06:25 2007
@@ -159,6 +159,7 @@
suite.addTestSuite(
MavenIT0113ServerAuthzAvailableToWagonMgrInPlugin.class );
suite.addTestSuite( MavenIT0114ExtensionThatProvidesResources.class );
suite.addTestSuite( MavenIT0118AttachedArtifactsInReactor.class );
+suite.addTestSuite( MavenITmng2254PomEncodingTest.class);
//
// Tests that need to be fixed.
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java?rev=584025view=auto
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2254PomEncodingTest.java
Thu Oct 11 19:06:25 2007
@@ -0,0 +1,37 @@
+package org.apache.maven.integrationtests;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Test that pom.xml encoding is properly detected.
+ *
+ * @author a href=mailto:[EMAIL PROTECTED]Herve Boutemy/a
+ *
+ */
+public class MavenITmng2254PomEncodingTest
+extends AbstractMavenIntegrationTestCase
+{
+public void testitMNG2254 ()
+throws Exception
+{
+// The testdir is computed from the location of this
+// file.
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-2254
svn commit: r582051 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/writers/rad/ test/java/org/apache/maven/plugin/eclipse/ test/resources/projects/projec
Author: brianf
Date: Thu Oct 4 18:25:10 2007
New Revision: 582051
URL: http://svn.apache.org/viewvc?rev=582051view=rev
Log:
merging patch for MECLIPSE-242
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/
- copied from r580176,
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml
- copied unchanged from r580176,
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/src/
- copied from r580176,
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/src/main/
- copied from r580176,
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/
- copied from r580176,
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt
- copied unchanged from r580176,
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-2/websettings
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java?rev=582051r1=582050r2=582051view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
Thu Oct 4 18:25:10 2007
@@ -26,6 +26,8 @@
import org.apache.maven.plugin.eclipse.Constants;
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
+import org.apache.maven.plugin.ide.IdeDependency;
+import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.plugin.ide.JeeUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
@@ -36,7 +38,8 @@
*
* @author a href=mailto:[EMAIL PROTECTED]Richard van Nieuwenhoven /a
*/
-public class RadWebSettingsWriter extends AbstractEclipseWriter
+public class RadWebSettingsWriter
+extends AbstractEclipseWriter
{
private static final String
COM_IBM_ETOOLS_SITEEDIT_WIZARDS_PROJECTFEATURE_WEB_SITE_FEATURE =
@@ -64,6 +67,14 @@
private static final String WEBSETTINGS_WEBSETTINGS = websettings;
+private static final String WEBSETTINGS_LIBMODULES = lib-modules;
+
+private static final String WEBSETTINGS_LIBMODULE = lib-module;
+
+private static final String WEBSETTINGS_LM_JAR = jar;
+
+private static final String WEBSETTINGS_LM_PROJECT = project;
+
/**
* the context root to use for this project
*/
@@ -72,8 +83,7 @@
/**
* required default constructor.
*
- * @param warContextRoot
- *the context root to use for this project
+ * @param warContextRoot the context root to use for this project
*/
public RadWebSettingsWriter( String warContextRoot )
{
@@ -83,10 +93,10 @@
/**
* write the websettings file for RAD6 if needed.
*
- * @throws MojoExecutionException
- * when writing the config files was not possible
+ * @throws MojoExecutionException when writing the config files was not
possible
*/
-public void write() throws MojoExecutionException
+public void write()
+throws MojoExecutionException
{
FileWriter w;
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase
svn commit: r580542 - /maven/site/trunk/src/site/xdoc/index.xml.vm
Author: brianf
Date: Fri Sep 28 20:48:40 2007
New Revision: 580542
URL: http://svn.apache.org/viewvc?rev=580542view=rev
Log:
google search box
Modified:
maven/site/trunk/src/site/xdoc/index.xml.vm
Modified: maven/site/trunk/src/site/xdoc/index.xml.vm
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/xdoc/index.xml.vm?rev=580542r1=580541r2=580542view=diff
==
--- maven/site/trunk/src/site/xdoc/index.xml.vm (original)
+++ maven/site/trunk/src/site/xdoc/index.xml.vm Fri Sep 28 20:48:40 2007
@@ -6,9 +6,20 @@
author email=[EMAIL PROTECTED]Jason van Zyl/author
/properties
body
+
!-- TODO: news? --
div id=downloadbox
- h5Get Maven ${currentVersion}/h5
+h5Search Maven Sites/h5
+!-- Google CSE Search Box Begins --
+form action=http://www.google.com/cse;
id=searchbox_006660305041243700248:hyqtfwsewpm
+ input type=hidden name=cx value=006660305041243700248:hyqtfwsewpm /
+ input type=text name=q size=25 /
+ input type=submit name=sa value=Search /
+/form
+script type=text/javascript
src=http://www.google.com/coop/cse/brand?form=searchbox_006660305041243700248%3Ahyqtfwsewpm;/script
+!-- Google CSE Search Box Ends --
+
+ h5Get Maven ${currentVersion}/h5
span style=display: block; text-align: right; font-size:
smallerReleased: 20 June 2007/span
p
a href=download.html
svn commit: r580109 - in /maven/plugins/branches/MECLIPSE-242/src: main/java/org/apache/maven/plugin/eclipse/writers/rad/ test/java/org/apache/maven/plugin/eclipse/ test/resources/projects/project-rad
Author: brianf
Date: Thu Sep 27 10:24:32 2007
New Revision: 580109
URL: http://svn.apache.org/viewvc?rev=580109view=rev
Log:
applied patch for MECLIPSE-242
Modified:
maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
maven/plugins/branches/MECLIPSE-242/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/pom.xml
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-2/pom.xml
maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-2/websettings
Modified:
maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java?rev=580109r1=580108r2=580109view=diff
==
---
maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
(original)
+++
maven/plugins/branches/MECLIPSE-242/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadWebSettingsWriter.java
Thu Sep 27 10:24:32 2007
@@ -26,6 +26,8 @@
import org.apache.maven.plugin.eclipse.Constants;
import org.apache.maven.plugin.eclipse.Messages;
import org.apache.maven.plugin.eclipse.writers.AbstractEclipseWriter;
+import org.apache.maven.plugin.ide.IdeDependency;
+import org.apache.maven.plugin.ide.IdeUtils;
import org.apache.maven.plugin.ide.JeeUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
@@ -36,7 +38,8 @@
*
* @author a href=mailto:[EMAIL PROTECTED]Richard van Nieuwenhoven /a
*/
-public class RadWebSettingsWriter extends AbstractEclipseWriter
+public class RadWebSettingsWriter
+extends AbstractEclipseWriter
{
private static final String
COM_IBM_ETOOLS_SITEEDIT_WIZARDS_PROJECTFEATURE_WEB_SITE_FEATURE =
@@ -64,6 +67,14 @@
private static final String WEBSETTINGS_WEBSETTINGS = websettings;
+private static final String WEBSETTINGS_LIBMODULES = lib-modules;
+
+private static final String WEBSETTINGS_LIBMODULE = lib-module;
+
+private static final String WEBSETTINGS_LM_JAR = jar;
+
+private static final String WEBSETTINGS_LM_PROJECT = project;
+
/**
* the context root to use for this project
*/
@@ -72,8 +83,7 @@
/**
* required default constructor.
*
- * @param warContextRoot
- *the context root to use for this project
+ * @param warContextRoot the context root to use for this project
*/
public RadWebSettingsWriter( String warContextRoot )
{
@@ -83,10 +93,10 @@
/**
* write the websettings file for RAD6 if needed.
*
- * @throws MojoExecutionException
- * when writing the config files was not possible
+ * @throws MojoExecutionException when writing the config files was not
possible
*/
-public void write() throws MojoExecutionException
+public void write()
+throws MojoExecutionException
{
FileWriter w;
if ( Constants.PROJECT_PACKAGING_WAR.equalsIgnoreCase(
config.getProject().getPackaging() ) )
@@ -109,8 +119,7 @@
/**
* write the websettings file for RAD6.
*
- * @param writer
- *where to write to
+ * @param writer where to write to
*/
private void writeModuleTypeFacetCore( XMLWriter writer )
{
@@ -140,14 +149,51 @@
writer.endElement();
writer.endElement();
writer.endElement();
-writer.endElement();
+
+// library modules
+writer.startElement( WEBSETTINGS_LIBMODULES );
+
+// iterate relevant dependencies (non-test, non-provided, project)
+IdeDependency[] deps = config.getDeps();
+if ( deps != null )
+{
+for ( int i = 0; i deps.length; i++ )
+{
+final IdeDependency dependency = deps[i];
+log.debug( RadWebSettingsWriter: checking dependency +
dependency.toString() );
+
+if ( dependency.isReferencedProject()
!dependency.isTestDependency() !dependency.isProvided() )
+{
+log.debug( RadWebSettingsWriter: dependency +
dependency.toString()
++ selected for inclusion as lib-module );
+
+String depName = IdeUtils.getProjectName(
config.getProjectNameTemplate(), dependency );
+String depJar = dependency.getArtifactId() + .jar;
+
+writer.startElement( WEBSETTINGS_LIBMODULE );
+
+writer.startElement( WEBSETTINGS_LM_JAR
svn commit: r580108 - /maven/plugins/branches/MECLIPSE-242/
Author: brianf Date: Thu Sep 27 10:23:44 2007 New Revision: 580108 URL: http://svn.apache.org/viewvc?rev=580108view=rev Log: made a copy Added: maven/plugins/branches/MECLIPSE-242/ - copied from r580107, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r580176 - in /maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4: ./ pom.xml src/ src/main/ src/main/resources/ src/main/resources/DummyResource.tx
Author: brianf Date: Thu Sep 27 15:20:28 2007 New Revision: 580176 URL: http://svn.apache.org/viewvc?rev=580176view=rev Log: added missing test files Added: maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt Added: maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml?rev=580176view=auto == --- maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml (added) +++ maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml Thu Sep 27 15:20:28 2007 @@ -0,0 +1,15 @@ +?xml version=1.0 encoding=UTF-8? +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; + modelVersion4.0.0/modelVersion + parent + groupIdeclipse.test/groupId + artifactIdproject-rad-5/artifactId + version0.0.1-SNAPSHOT/version + /parent + packagingjar/packaging + groupIdeclipse.test/groupId + artifactIdproject-rad-5_4/artifactId + version0.0.1-SNAPSHOT/version +/project \ No newline at end of file Added: maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-242/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt?rev=580176view=auto == (empty)
svn commit: r580196 - in /maven/enforcer/trunk: ./ enforcer-api/ enforcer-rules/ enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ enforcer-rules/src/main/java/org/apache/maven/plugins/e
Author: brianf
Date: Thu Sep 27 19:26:19 2007
New Revision: 580196
URL: http://svn.apache.org/viewvc?rev=580196view=rev
Log:
new rule to enforce no repositories in the poms.
Added:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/EnforcerTestUtils.java
Modified:
maven/enforcer/trunk/ (props changed)
maven/enforcer/trunk/enforcer-api/ (props changed)
maven/enforcer/trunk/enforcer-rules/ (props changed)
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
maven/enforcer/trunk/maven-enforcer-plugin/ (props changed)
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/util/EnforcerUtils.java
Propchange: maven/enforcer/trunk/
--
--- svn:ignore (added)
+++ svn:ignore Thu Sep 27 19:26:19 2007
@@ -0,0 +1,2 @@
+target
+archetype.properties
Propchange: maven/enforcer/trunk/enforcer-api/
--
--- svn:ignore (original)
+++ svn:ignore Thu Sep 27 19:26:19 2007
@@ -7,3 +7,4 @@
*.iws
*.iml
.settings
+archetype.properties
Propchange: maven/enforcer/trunk/enforcer-rules/
--
--- svn:ignore (added)
+++ svn:ignore Thu Sep 27 19:26:19 2007
@@ -0,0 +1,5 @@
+target
+.classpath
+.project
+.settings
+archetype.properties
Added:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java?rev=580196view=auto
==
---
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
(added)
+++
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
Thu Sep 27 19:26:19 2007
@@ -0,0 +1,113 @@
+package org.apache.maven.plugins.enforcer;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.enforcer.rule.api.EnforcerRule;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
+import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.plugins.enforcer.utils.EnforcerRuleUtils;
+import org.apache.maven.project.MavenProject;
+import
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+/**
+ * @author a href=mailto:[EMAIL PROTECTED]Brian Fox/a
+ *
+ */
+public class RequireNoRepositories
+implements EnforcerRule
+{
+/**
+ * The message to be printed in case the condition
+ * returns btrue/b
+ *
+ * @required
+ * @parameter
+ */
+public String message;
+
+public void execute ( EnforcerRuleHelper helper )
+throws EnforcerRuleException
+{
+EnforcerRuleUtils utils = new EnforcerRuleUtils( helper );
+
+MavenProject project;
+try
+{
+project = (MavenProject) helper.evaluate( ${project} );
+
+List models = utils.getModelsRecursively( project.getGroupId(),
project.getArtifactId(), project
+.getVersion(), new File( project.getBasedir(), pom.xml ) );
+
+ List badModels = checkModels( models );
+
+ // if anything was found, log it then append the
+ // optional message.
+ if ( !badModels.isEmpty() )
+ {
+ StringBuffer newMsg = new StringBuffer();
+ newMsg.append( Some poms have repositories defined:\n );
+ Iterator iter
svn commit: r579784 - in /maven/enforcer/trunk/maven-enforcer-plugin/src/site: apt/rules/requireProperty.apt site.xml
Author: brianf Date: Wed Sep 26 13:19:55 2007 New Revision: 579784 URL: http://svn.apache.org/viewvc?rev=579784view=rev Log: MENFORCER-16 applied site patch from Paul Gier Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/site/apt/rules/requireProperty.apt maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/site/apt/rules/requireProperty.apt URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/site/apt/rules/requireProperty.apt?rev=579784r1=579783r2=579784view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/site/apt/rules/requireProperty.apt (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/site/apt/rules/requireProperty.apt Wed Sep 26 13:19:55 2007 @@ -60,9 +60,9 @@ rules requireProperty propertybasedir/property - messageYou must have a basedir!/message - regex\d/regex - regexMessageYou must have a digit in your baseDir!/regexMessage + messageYou must have a basedir!/message + regex\d/regex + regexMessageYou must have a digit in your baseDir!/regexMessage /requireProperty /rules failtrue/fail @@ -75,4 +75,4 @@ [...] /project +---+ - \ No newline at end of file + Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml?rev=579784r1=579783r2=579784view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml Wed Sep 26 13:19:55 2007 @@ -26,16 +26,7 @@ item name=Goals href=plugin-info.html/ item name=Usage href=usage.html/ item name=FAQ href=faq.html/ -/menu -menu name=Standard Rules - item name=Overview href=rules/index.html/ - item name=BannedDependencies href=rules/bannedDependencies.html/ - item name=EvaluateBeanshell href=rules/evaluateBeanshell.html/ - item name=NoSnapshots href=rules/noSnapshots.html/ - item name=RequireJavaVersion href=rules/requireJavaVersion.html/ - item name=RequireMavenVersion href=rules/requireMavenVersion.html/ - item name=RequireOS href=rules/requireOS.html/ - item name=Version Range Specification href=rules/versionRanges.html/ + item name=Standard Rules href=rules/index.html/ /menu menu name=Custom Rules item name=Writing a custom rule href=http://maven.apache.org/enforcer/enforcer-api/writing-a-custom-rule.html/
svn commit: r579852 - in /maven/shared/trunk/maven-plugin-testing-tools: pom.xml src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
Author: brianf Date: Wed Sep 26 16:50:39 2007 New Revision: 579852 URL: http://svn.apache.org/viewvc?rev=579852view=rev Log: =Fixed bad version Modified: maven/shared/trunk/maven-plugin-testing-tools/pom.xml maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java Modified: maven/shared/trunk/maven-plugin-testing-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-plugin-testing-tools/pom.xml?rev=579852r1=579851r2=579852view=diff == --- maven/shared/trunk/maven-plugin-testing-tools/pom.xml (original) +++ maven/shared/trunk/maven-plugin-testing-tools/pom.xml Wed Sep 26 16:50:39 2007 @@ -67,7 +67,7 @@ dependency groupIdorg.apache.maven.shared/groupId artifactIdmaven-test-tools/artifactId - version1.0-alpha-1/version + version1.0-alpha-2-SNAPSHOT/version scopetest/scope /dependency dependency Modified: maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java?rev=579852r1=579851r2=579852view=diff == --- maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java (original) +++ maven/shared/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java Wed Sep 26 16:50:39 2007 @@ -212,8 +212,7 @@ goals.add( package ); File buildLog = logFile == null ? pomInfo.getBuildLogFile() : logFile; - -System.out.println( Using staged plugin-pom: + pomInfo.getPomFile().getAbsolutePath() ); +System.out.println( Now Building test version of the plugin...\nUsing staged plugin-pom: + pomInfo.getPomFile().getAbsolutePath() ); buildTool.executeMaven( pomInfo.getPomFile(), properties, goals, buildLog );
svn commit: r579029 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/site/apt/index.apt src/site/apt/usage.apt
Author: brianf Date: Mon Sep 24 18:29:32 2007 New Revision: 579029 URL: http://svn.apache.org/viewvc?rev=579029view=rev Log: site updates. prepare dependencies for release Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt maven/plugins/trunk/maven-dependency-plugin/src/site/apt/usage.apt Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=579029r1=579028r2=579029view=diff == --- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Mon Sep 24 18:29:32 2007 @@ -1,329 +1,311 @@ 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; -!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * + !-- +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* License); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +* -- - modelVersion4.0.0/modelVersion - parent -artifactIdmaven-plugins/artifactId -groupIdorg.apache.maven.plugins/groupId -version8/version - /parent - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-dependency-plugin/artifactId - packagingmaven-plugin/packaging - nameMaven Dependency Plugin/name - version2.0-alpha-5-SNAPSHOT/version - prerequisites -maven2.0.3/maven - /prerequisites - issueManagement -systemJIRA/system -urlhttp://jira.codehaus.org/browse/MDEP/url - /issueManagement - developers -developer - idbrianf/id - nameBrian Fox/name - email[EMAIL PROTECTED]/email - roles -roleLead Developer/role - /roles - timezone5/timezone -/developer -developer - iddtran/id - nameDan T. Tran/name - email[EMAIL PROTECTED]/email - organization - /organization - roles -roleDeveloper/role - /roles -/developer -developer - idjdcasey/id - nameJohn Casey/name - email[EMAIL PROTECTED]/email - organization - /organization - roles -roleDeveloper/role - /roles -/developer - /developers - licenses -license - nameApache License 2.0/name - urlhttp://www.apache.org/licenses/LICENSE-2.0.txt/url - distributionrepo/distribution -/license - /licenses - build -plugins - plugin -artifactIdmaven-enforcer-plugin/artifactId -version1.0-alpha-3/version -executions - execution -goals - goalenforce/goal -/goals -idensure-no-container-api/id -configuration - rules -bannedDependencies - excludes -excludeorg.codehaus.plexus:plexus-component-api/exclude - /excludes - messageThe new containers are not supported. You probably added a dependency that is missing the exclusions./message -/bannedDependencies - /rules - failtrue/fail -/configuration - /execution -/executions - /plugin - plugin -groupIdorg.codehaus.mojo/groupId -artifactIdcobertura-maven-plugin/artifactId -version2.0/version -executions
svn commit: r575837 - /maven/retired/
Author: brianf Date: Fri Sep 14 17:52:53 2007 New Revision: 575837 URL: http://svn.apache.org/viewvc?rev=575837view=rev Log: creating the retired folder Added: maven/retired/
svn commit: r575838 - in /maven: plugins/trunk/maven-clover-plugin/ retired/maven-clover-plugin/
Author: brianf Date: Fri Sep 14 17:53:49 2007 New Revision: 575838 URL: http://svn.apache.org/viewvc?rev=575838view=rev Log: moving clover to retired Added: maven/retired/maven-clover-plugin/ - copied from r575837, maven/plugins/trunk/maven-clover-plugin/ Removed: maven/plugins/trunk/maven-clover-plugin/
svn commit: r575839 - in /maven: plugins/trunk/maven-antlr-plugin/ retired/maven-antlr-plugin/
Author: brianf Date: Fri Sep 14 17:57:35 2007 New Revision: 575839 URL: http://svn.apache.org/viewvc?rev=575839view=rev Log: moving antlr to retired -- was moved to mojo Added: maven/retired/maven-antlr-plugin/ - copied from r575838, maven/plugins/trunk/maven-antlr-plugin/ Removed: maven/plugins/trunk/maven-antlr-plugin/
svn commit: r575842 - /maven/plugins/trunk/pom.xml
Author: brianf Date: Fri Sep 14 18:09:06 2007 New Revision: 575842 URL: http://svn.apache.org/viewvc?rev=575842view=rev Log: clover was moved Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=575842r1=575841r2=575842view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Fri Sep 14 18:09:06 2007 @@ -96,7 +96,6 @@ modulemaven-changes-plugin/module modulemaven-checkstyle-plugin/module modulemaven-clean-plugin/module -modulemaven-clover-plugin/module modulemaven-compiler-plugin/module modulemaven-dependency-plugin/module modulemaven-deploy-plugin/module
svn commit: r575843 - /maven/site/trunk/src/site/apt/plugins/index.apt
Author: brianf
Date: Fri Sep 14 18:14:19 2007
New Revision: 575843
URL: http://svn.apache.org/viewvc?rev=575843view=rev
Log:
noted move to atlassian
Modified:
maven/site/trunk/src/site/apt/plugins/index.apt
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=575843r1=575842r2=575843view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Fri Sep 14 18:14:19 2007
@@ -59,7 +59,7 @@
*---++--+
| {{{/plugins/maven-checkstyle-plugin/} checkstyle}} | 2.1|
Generate a checkstyle report.
*---++--+
-| {{{/plugins/maven-clover-plugin/} clover}} | 2.4|
Generate a Clover report.
+| {{{/plugins/maven-clover-plugin/} clover}} | 2.4|
Generate a Clover report. NOTE: Moved to Atlassian.com
*---++--+
| {{{/plugins/maven-doap-plugin/} doap}} | 1.0-beta-1 |
Generate a Description of a Project (DOAP) file from a POM.
*---++--+
svn commit: r574666 - in /maven/sandbox/trunk/archetypeng/archetype-plugin/src/test: ./ projects/ projects/simple-inheritence/ projects/simple-inheritence/enforcer-rules/
Author: brianf Date: Tue Sep 11 12:06:19 2007 New Revision: 574666 URL: http://svn.apache.org/viewvc?rev=574666view=rev Log: added IT sample Added: maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/pom.xml Added: maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml?rev=574666view=auto == --- maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml (added) +++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/simple-inheritence/enforcer-rules/pom.xml Tue Sep 11 12:06:19 2007 @@ -0,0 +1,117 @@ +?xml version=1.0 encoding=UTF-8? +!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +-- +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; + modelVersion4.0.0/modelVersion + parent + groupIdorg.apache.maven.archetype.test/groupId +artifactIdinheritence-test/artifactId + version1-SNAPSHOT/version + /parent + + artifactIdenforcer-rules/artifactId + packagingjar/packaging + version1.0-SNAPSHOT/version + + nameEnforcer Rules/name + descriptionThis component contains the standard Enforcer Rules/description + build + plugins + plugin + artifactIdmaven-compiler-plugin/artifactId + configuration + source1.4/source + target1.4/target + /configuration + /plugin + plugin + groupIdorg.codehaus.plexus/groupId + artifactIdplexus-maven-plugin/artifactId + executions + execution + goals + goaldescriptor/goal + /goals + /execution + /executions + /plugin + plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-jar-plugin/artifactId + executions + execution + goals + goaltest-jar/goal + /goals + /execution + /executions + /plugin + /plugins + /build + dependencies + dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-artifact/artifactId + version2.0.7/version + /dependency + dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-plugin-api/artifactId + version2.0.7/version + /dependency + dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-project/artifactId + version2.0.7/version + /dependency + dependency + groupIdorg.apache.maven/groupId + artifactIdmaven-core/artifactId + version2.0.7/version
svn commit: r574760 - in /maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects: deep-inheritence/ deep-inheritence/a/ deep-inheritence/a/b/ sibling-dependency/ sibling-dependency/a/ sibl
Author: brianf Date: Tue Sep 11 18:47:05 2007 New Revision: 574760 URL: http://svn.apache.org/viewvc?rev=574760view=rev Log: more sample projects Added: maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/b/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/pom.xml maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/a/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/a/pom.xml maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/b/ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/b/pom.xml maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/sibling-dependency/pom.xml Added: maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml?rev=574760view=auto == --- maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml (added) +++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/b/pom.xml Tue Sep 11 18:47:05 2007 @@ -0,0 +1,32 @@ +!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ License); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + -- + +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; + modelVersion4.0.0/modelVersion + parent +groupIdorg.apache.maven.archetype.test.a/groupId +artifactIddeep-inheritence-test-a/artifactId +version1-SNAPSHOT/version + /parent + artifactIddeep-inheritence-test-b/artifactId + packagingpom/packaging + nameInheritence B/name + +/project Added: maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml?rev=574760view=auto == --- maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml (added) +++ maven/sandbox/trunk/archetypeng/archetype-plugin/src/test/projects/deep-inheritence/a/pom.xml Tue Sep 11 18:47:05 2007 @@ -0,0 +1,37 @@ +!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ License); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + -- + +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; + modelVersion4.0.0/modelVersion + parent +artifactIddeep-inheritence-test/artifactId
svn commit: r574764 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/ main/java/org/apache/maven/plugin/
Author: brianf Date: Tue Sep 11 18:59:55 2007 New Revision: 574764 URL: http://svn.apache.org/viewvc?rev=574764view=rev Log: merged in patch from meclipse-213 Added: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-1/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.jar - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.jar maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-1/1.0/multymodule-1-1.0.pom maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-2/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.pom maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.war - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-2/1.0/multymodule-2-1.0.war maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-4/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.jar - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.jar maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/m2repo/eclipsetest/multymodule-4/1.0/multymodule-4-1.0.pom maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/ - copied from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/expected/.project - copied unchanged from r572223, maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test
svn commit: r574765 - /maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/
Author: brianf Date: Tue Sep 11 19:00:17 2007 New Revision: 574765 URL: http://svn.apache.org/viewvc?rev=574765view=rev Log: branch is merged Removed: maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/
svn commit: r574766 - in /maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main: java/org/apache/maven/plugin/dependency/analyze-report.properties resources/analyze-report.properties
Author: brianf Date: Tue Sep 11 19:06:07 2007 New Revision: 574766 URL: http://svn.apache.org/viewvc?rev=574766view=rev Log: moved to the correct location Added: maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/resources/analyze-report.properties - copied unchanged from r574765, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/java/org/apache/maven/plugin/dependency/analyze-report.properties Removed: maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/java/org/apache/maven/plugin/dependency/analyze-report.properties
svn commit: r574768 - in /maven/plugins/trunk/maven-dependency-plugin: ./ src/main/java/org/apache/maven/plugin/dependency/ src/main/resources/ src/site/ src/test/resources/m2repo/maven/ src/test/reso
Author: brianf Date: Tue Sep 11 19:13:45 2007 New Revision: 574768 URL: http://svn.apache.org/viewvc?rev=574768view=rev Log: merged in branch with the patch from mdep-104 Added: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java maven/plugins/trunk/maven-dependency-plugin/src/main/resources/analyze-report.properties - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/main/resources/analyze-report.properties maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/ - copied from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/maven-parent/ - copied from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/maven-parent/ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/maven-parent/5/ - copied from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/maven-parent/5/ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/maven-parent/5/maven-parent-5.pom - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/maven-parent/5/maven-parent-5.pom maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/maven-parent/5/maven-parent-5.pom.sha1 - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/maven-parent/5/maven-parent-5.pom.sha1 maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/ - copied from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/ - copied from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/maven-metadata-local.xml - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/maven-metadata-local.xml maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/ - copied from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.jar - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.jar maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.pom - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-dependency-plugin/test/maven-dependency-plugin-test.pom maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-metadata-central.xml - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-metadata-central.xml maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/ - copied from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/8/ - copied from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo/maven/plugins/maven-plugins/8/ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/m2repo/maven/plugins/maven-plugins/8/maven-plugins-8.pom - copied unchanged from r574766, maven/plugins/branches/maven-dependency-plugin-MDEP-71/src/test/resources/m2repo
svn commit: r574769 - in /maven/plugins/trunk/maven-dependency-plugin/src/main: java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java resources/analyze-report.properties
Author: brianf
Date: Tue Sep 11 19:33:07 2007
New Revision: 574769
URL: http://svn.apache.org/viewvc?rev=574769view=rev
Log:
fixed titles
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/resources/analyze-report.properties
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java?rev=574769r1=574768r2=574769view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportMojo.java
Tue Sep 11 19:33:07 2007
@@ -148,12 +148,12 @@
public String getName( Locale locale )
{
-return Analysis Dependencies ;
+return Dependency Analysis ;
}
public String getDescription( Locale locale )
{
-return Analysis dependencies of the project (used declared, used
undeclared, unused declared) ;
+return Dependency Analysis of the project (used declared, used
undeclared, unused declared) ;
}
protected Renderer getSiteRenderer()
@@ -163,7 +163,7 @@
public String getOutputName()
{
-return Analysis Dependencies;
+return Dependency Analysis;
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/resources/analyze-report.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/resources/analyze-report.properties?rev=574769r1=574768r2=574769view=diff
==
---
maven/plugins/trunk/maven-dependency-plugin/src/main/resources/analyze-report.properties
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/resources/analyze-report.properties
Tue Sep 11 19:33:07 2007
@@ -18,7 +18,7 @@
#analyze.report.
analyze.report.header=Dependencies Report
-analyze.report.mainTitle=Analysis dependencies
+analyze.report.mainTitle=Dependency Analysis
analyze.report.noDependency=None
analyze.report.UsedDeclaredDependencies=Used declared dependencies
analyze.report.UsedUndeclaredDependencies=Used undeclared dependencies
svn commit: r574111 [1/3] - in /maven/sandbox/trunk/plugins: ./ maven-shade-plugin/ maven-shade-plugin/src/ maven-shade-plugin/src/main/ maven-shade-plugin/src/main/java/ maven-shade-plugin/src/main/j
Author: brianf Date: Sun Sep 9 18:06:19 2007 New Revision: 574111 URL: http://svn.apache.org/viewvc?rev=574111view=rev Log: initial import of shade. Packages and headers already refactored. Original source included in shade.tar.gz in root. Added: maven/sandbox/trunk/plugins/maven-shade-plugin/ maven/sandbox/trunk/plugins/maven-shade-plugin/pom.xml maven/sandbox/trunk/plugins/maven-shade-plugin/shade.tar.gz (with props) maven/sandbox/trunk/plugins/maven-shade-plugin/src/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/ShadeConfiguration.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/Shader.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/ShadingResult.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSet.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/PackageRelocation.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/MavenJDOMWriter.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/pom/PomWriter.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/Relocator.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheLicenseResourceTransformer.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ApacheNoticeResourceTransformer.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ComponentsXmlResourceTransformer.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ResourceTransformer.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/XmlAppendingTransformer.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/jars/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/jars/plexus-utils-1.4.1.jar (with props) maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/jars/test-project-1.0-SNAPSHOT.jar (with props) maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/ShadeMojoTest.java maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/projects/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/projects/default-config-project/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/projects/default-config-project/pom.xml maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/projects/no-relocation-project/ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/projects/no-relocation
svn commit: r574112 - /maven/sandbox/trunk/plugins/maven-shade-plugin/shade.tar.gz
Author: brianf Date: Sun Sep 9 18:07:25 2007 New Revision: 574112 URL: http://svn.apache.org/viewvc?rev=574112view=rev Log: removed original source shade.tar.gz Removed: maven/sandbox/trunk/plugins/maven-shade-plugin/shade.tar.gz
svn commit: r572222 - /maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/
Author: brianf Date: Sun Sep 2 19:56:22 2007 New Revision: 57 URL: http://svn.apache.org/viewvc?rev=57view=rev Log: made a copy Added: maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/ - copied from r572221, maven/plugins/trunk/maven-eclipse-plugin/
svn commit: r572223 [2/2] - in /maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/ main/java/or
Added:
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/src/main/java/DummyClass.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/src/main/java/DummyClass.txt?rev=572223view=auto
==
---
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/src/main/java/DummyClass.txt
(added)
+++
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-1/src/main/java/DummyClass.txt
Sun Sep 2 19:59:36 2007
@@ -0,0 +1,7 @@
+/**
+ * @author a href=mailto:[EMAIL PROTECTED]Trygve Laugstoslash;l/a
+ * @version $Id: DummyClass.txt 359507 2005-12-28 13:14:19Z fgiust $
+ */
+public class DummyClass
+{
+}
Added:
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/.classpath?rev=572223view=auto
==
---
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
(added)
+++
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
Sun Sep 2 19:59:36 2007
@@ -0,0 +1,16 @@
+classpath
+ classpathentry kind=src path=src/main/java/
+ classpathentry kind=output path=target/classes/
+ classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/
+ classpathentry kind=var
path=M2_REPO/eclipsetest/direct-optional/1.0/direct-optional-1.0.jar/
+ classpathentry kind=var
path=M2_REPO/eclipsetest/deps-direct-compile/1.0/deps-direct-compile-1.0.jar/
+ classpathentry kind=src path=/multymodule-4-1.0/
+ classpathentry kind=var
path=M2_REPO/eclipsetest/direct-test/1.0/direct-test-1.0.jar/
+ classpathentry kind=var
path=M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar/
+ classpathentry kind=var
path=M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar/
+ classpathentry kind=lib
path=/tmp/maven-eclipse-plugin-trunk/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar/
+ classpathentry kind=src path=/multymodule-1-1.0/
+ classpathentry kind=lib path=direct-sysdep.jar/
+ classpathentry kind=var
path=M2_REPO/eclipsetest/direct-provided/1.0/direct-provided-1.0.jar/
+ classpathentry kind=var
path=M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar/
+/classpath
\ No newline at end of file
Added:
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/.project?rev=572223view=auto
==
---
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/.project
(added)
+++
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/.project
Sun Sep 2 19:59:36 2007
@@ -0,0 +1,16 @@
+projectDescription
+ namemultymodule-2-1.0/name
+ comment/
+ projects
+projectmultymodule-4-1.0/project
+projectmultymodule-1-1.0/project
+ /projects
+ buildSpec
+buildCommand
+ nameorg.eclipse.jdt.core.javabuilder/name
+/buildCommand
+ /buildSpec
+ natures
+natureorg.eclipse.jdt.core.javanature/nature
+ /natures
+/projectDescription
\ No newline at end of file
Added:
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/pom.xml?rev=572223view=auto
==
---
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/pom.xml
(added)
+++
maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-213/src/test/resources/projects/project-34/multymodule-2/expected/pom.xml
Sun Sep 2 19:59:36 2007
@@ -0,0 +1,61 @@
+?xml version=1.0 encoding=UTF-8?
+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;
+ modelVersion4.0.0/modelVersion
+
svn commit: r571772 - /maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt
Author: brianf Date: Sat Sep 1 05:01:34 2007 New Revision: 571772 URL: http://svn.apache.org/viewvc?rev=571772view=rev Log: updated with working example Modified: maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt Modified: maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt?rev=571772r1=571771r2=571772view=diff == --- maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt Sat Sep 1 05:01:34 2007 @@ -60,7 +60,7 @@ * Using the attached test JAR In order to use the attached test JAR that was created above you simply specify a dependency on the main - artifact with a specified type of test-jar: + artifact with a specified type of tests: ++ @@ -71,7 +71,8 @@ groupIdcom.myco.app/groupId artifactIdfoo/artifactId version1.0-SNAPSHOT/version - typetest-jar/type + typetests/type + scopetest/scope /dependency /dependencies ...
svn commit: r571652 - /maven/enforcer/
Author: brianf Date: Fri Aug 31 17:11:29 2007 New Revision: 571652 URL: http://svn.apache.org/viewvc?rev=571652view=rev Log: new root enforcer folder Added: maven/enforcer/
svn commit: r571653 - in /maven/enforcer: branches/ tags/ trunk/
Author: brianf Date: Fri Aug 31 17:16:55 2007 New Revision: 571653 URL: http://svn.apache.org/viewvc?rev=571653view=rev Log: trunk/tags/branches structure Added: maven/enforcer/branches/ maven/enforcer/tags/ maven/enforcer/trunk/
svn commit: r571654 - in /maven: enforcer/trunk/maven-enforcer-plugin/ plugins/trunk/maven-enforcer-plugin/
Author: brianf Date: Fri Aug 31 17:20:54 2007 New Revision: 571654 URL: http://svn.apache.org/viewvc?rev=571654view=rev Log: Moved remotely Added: maven/enforcer/trunk/maven-enforcer-plugin/ - copied from r571653, maven/plugins/trunk/maven-enforcer-plugin/ Removed: maven/plugins/trunk/maven-enforcer-plugin/
svn commit: r571655 - in /maven: enforcer/trunk/maven-enforcer-rule-api/ shared/trunk/maven-enforcer-rule-api/
Author: brianf Date: Fri Aug 31 17:21:34 2007 New Revision: 571655 URL: http://svn.apache.org/viewvc?rev=571655view=rev Log: Moved remotely Added: maven/enforcer/trunk/maven-enforcer-rule-api/ - copied from r571654, maven/shared/trunk/maven-enforcer-rule-api/ Removed: maven/shared/trunk/maven-enforcer-rule-api/
svn commit: r571657 - /maven/shared/trunk/pom.xml
Author: brianf Date: Fri Aug 31 17:23:43 2007 New Revision: 571657 URL: http://svn.apache.org/viewvc?rev=571657view=rev Log: enforcer-rule-api has been moved. Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=571657r1=571656r2=571657view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Fri Aug 31 17:23:43 2007 @@ -43,7 +43,6 @@ modulemaven-repository-builder/module modulemaven-common-artifact-filters/module modulemaven-dependency-analyzer/module -modulemaven-enforcer-rule-api/module modulemaven-shared-jar/module /modules scm
svn commit: r571660 - /maven/plugins/trunk/pom.xml
Author: brianf Date: Fri Aug 31 17:37:10 2007 New Revision: 571660 URL: http://svn.apache.org/viewvc?rev=571660view=rev Log: enforcer has moved Modified: maven/plugins/trunk/pom.xml Modified: maven/plugins/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/pom.xml?rev=571660r1=571659r2=571660view=diff == --- maven/plugins/trunk/pom.xml (original) +++ maven/plugins/trunk/pom.xml Fri Aug 31 17:37:10 2007 @@ -105,7 +105,6 @@ modulemaven-ear-plugin/module modulemaven-eclipse-plugin/module modulemaven-ejb-plugin/module -modulemaven-enforcer-plugin/module modulemaven-gpg-plugin/module modulemaven-help-plugin/module modulemaven-idea-plugin/module
svn commit: r571667 - in /maven/enforcer/trunk: maven-enforcer-plugin/pom.xml maven-enforcer-plugin/src/site/site.xml maven-enforcer-rule-api/pom.xml pom.xml
Author: brianf Date: Fri Aug 31 18:47:36 2007 New Revision: 571667 URL: http://svn.apache.org/viewvc?rev=571667view=rev Log: refactored to new folder layout Added: maven/enforcer/trunk/pom.xml Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=571667r1=571666r2=571667view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Fri Aug 31 18:47:36 2007 @@ -68,6 +68,16 @@ /executions /plugin /plugins + pluginManagement + plugins +plugin + artifactIdmaven-release-plugin/artifactId + configuration + tagBasehttps://svn.apache.org/repos/asf/maven/enforcer/tags/tagBase + /configuration +/plugin + /plugins +/pluginManagement resources !-- Include super-pom defined main/resources Removing this section will break the build. @@ -112,9 +122,9 @@ version2.3/version /dependency dependency -groupIdorg.apache.maven.shared/groupId +groupIdorg.apache.maven.enforcer/groupId artifactIdmaven-enforcer-rule-api/artifactId - version1.0-alpha-2/version + version1.0-alpha-3-SNAPSHOT/version /dependency dependency groupIdorg.beanshell/groupId Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml?rev=571667r1=571666r2=571667view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/site/site.xml Fri Aug 31 18:47:36 2007 @@ -38,7 +38,7 @@ item name=Version Range Specification href=rules/versionRanges.html/ /menu menu name=Custom Rules - item name=Writing a custom rule href=http://maven.apache.org/shared/maven-enforcer-rule-api/writing-a-custom-rule.html/ + item name=Writing a custom rule href=http://maven.apache.org/enforcer/maven-enforcer-rule-api/writing-a-custom-rule.html/ /menu menu name=Resources item name=Maven 2.0.x Version Range Syntax href=http://docs.codehaus.org/display/MAVEN/Dependency+Mediation+and+Conflict+Resolution#DependencyMediationandConflictResolution-DependencyVersionRanges; / Modified: maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml?rev=571667r1=571666r2=571667view=diff == --- maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml Fri Aug 31 18:47:36 2007 @@ -21,32 +21,17 @@ 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; modelVersion4.0.0/modelVersion parent - groupIdorg.apache.maven.shared/groupId - artifactIdmaven-shared-components/artifactId - version7/version + groupIdorg.apache.maven.enforcer/groupId +artifactIdenforcer/artifactId + version1-SNAPSHOT/version /parent - groupIdorg.apache.maven.shared/groupId + artifactIdmaven-enforcer-rule-api/artifactId packagingjar/packaging version1.0-alpha-3-SNAPSHOT/version nameMaven Enforcer Rule API/name descriptionThis component provides the generic interfaces needed to implement custom rules for the maven-enforcer-plugin./description - issueManagement - systemJIRA/system - urlhttp://jira.codehaus.org/browse/MENFORCER/url - /issueManagement - developers - developer - idbrianf/id - nameBrian Fox/name - email[EMAIL PROTECTED]/email - roles - roleLead Developer/role - /roles - timezone5/timezone - /developer - /developers build plugins plugin @@ -68,17 +53,6
svn commit: r571669 - in /maven/enforcer/trunk: ./ enforcer-api/ enforcer-api/src/custom-rule-sample/ enforcer-api/src/custom-rule-sample/src/ enforcer-api/src/custom-rule-sample/src/main/java/org/apa
Author: brianf Date: Fri Aug 31 18:59:22 2007 New Revision: 571669 URL: http://svn.apache.org/viewvc?rev=571669view=rev Log: more refactor Added: maven/enforcer/trunk/enforcer-api/ - copied from r571655, maven/enforcer/trunk/maven-enforcer-rule-api/ maven/enforcer/trunk/enforcer-api/pom.xml - copied, changed from r571667, maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml Removed: maven/enforcer/trunk/maven-enforcer-rule-api/ Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/usage-pom.xml maven/enforcer/trunk/enforcer-api/src/site/resources/custom-rule.zip maven/enforcer/trunk/pom.xml Copied: maven/enforcer/trunk/enforcer-api/pom.xml (from r571667, maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml) URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/pom.xml?p2=maven/enforcer/trunk/enforcer-api/pom.xmlp1=maven/enforcer/trunk/maven-enforcer-rule-api/pom.xmlr1=571667r2=571669rev=571669view=diff == --- maven/enforcer/trunk/maven-enforcer-rule-api/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/pom.xml Fri Aug 31 18:59:22 2007 @@ -26,11 +26,11 @@ version1-SNAPSHOT/version /parent - artifactIdmaven-enforcer-rule-api/artifactId + artifactIdenforcer-api/artifactId packagingjar/packaging version1.0-alpha-3-SNAPSHOT/version - nameMaven Enforcer Rule API/name + nameEnforcer API/name descriptionThis component provides the generic interfaces needed to implement custom rules for the maven-enforcer-plugin./description build plugins Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml?rev=571669r1=571655r2=571669view=diff == --- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/pom.xml Fri Aug 31 18:59:22 2007 @@ -11,9 +11,9 @@ /build dependencies dependency - groupIdorg.apache.maven.shared/groupId - artifactIdmaven-enforcer-rule-api/artifactId - version1.0-alpha-1/version + groupIdorg.apache.maven.enforcer/groupId + artifactIdenforcer-api/artifactId + version1.0-alpha-3/version /dependency dependency groupIdorg.apache.maven/groupId Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java?rev=571669r1=571655r2=571669view=diff == --- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java (original) +++ maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/main/java/org/apache/maven/shared/rule/myCustomRule.java Fri Aug 31 18:59:22 2007 @@ -1,4 +1,4 @@ -package org.apache.maven.shared.rule; +package org.apache.maven.enforcer.rule; import java.io.File; @@ -7,9 +7,9 @@ import org.apache.maven.execution.RuntimeInformation; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.enforcer.rule.api.EnforcerRule; -import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException; -import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper; +import org.apache.maven.enforcer.rule.api.EnforcerRule; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; Modified: maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml?rev=571669r1=571655r2=571669view=diff == --- maven/enforcer/trunk/enforcer-api/src/custom-rule-sample/src/usage-pom.xml (original) +++ maven/enforcer/trunk/enforcer-api/src
svn commit: r571670 - in /maven/enforcer/trunk: enforcer-rules/ enforcer-rules/src/ enforcer-rules/src/main/ enforcer-rules/src/main/java/ enforcer-rules/src/main/java/org/ enforcer-rules/src/main/jav
Author: brianf Date: Fri Aug 31 19:15:28 2007 New Revision: 571670 URL: http://svn.apache.org/viewvc?rev=571670view=rev Log: more refactor Added: maven/enforcer/trunk/enforcer-rules/ maven/enforcer/trunk/enforcer-rules/pom.xml maven/enforcer/trunk/enforcer-rules/src/ maven/enforcer/trunk/enforcer-rules/src/main/ maven/enforcer/trunk/enforcer-rules/src/main/java/ maven/enforcer/trunk/enforcer-rules/src/main/java/org/ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractBanDependencies.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/BannedDependencies.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DefaultEnforcementRuleHelper.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DefaultEnforcementRuleHelper.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EnforcerExpressionEvaluator.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforcerExpressionEvaluator.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EvaluateBeanshell.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/NoSnapshots.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/NoSnapshots.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireMavenVersion.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireOS.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java - copied unchanged from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireProperty.java Removed: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractBanDependencies.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractVersionEnforcer.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/BannedDependencies.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/DefaultEnforcementRuleHelper.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforcerExpressionEvaluator.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EvaluateBeanshell.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/NoSnapshots.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java maven/enforcer/trunk/maven
svn commit: r571671 - in /maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven: plugin/ plugins/ plugins/enforcer/
Author: brianf Date: Fri Aug 31 19:17:16 2007 New Revision: 571671 URL: http://svn.apache.org/viewvc?rev=571671view=rev Log: more refactor Added: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/ - copied from r571655, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/ maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/ - copied from r571670, maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/ Removed: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/
svn commit: r571672 - in /maven/enforcer/trunk/maven-enforcer-plugin/src: main/java/org/apache/maven/plugins/enforcer/util/ test/java/org/apache/maven/plugin/enforcer/
Author: brianf
Date: Fri Aug 31 19:57:05 2007
New Revision: 571672
URL: http://svn.apache.org/viewvc?rev=571672view=rev
Log:
more refactor
Removed:
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestAbstractVersionEnforcer.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestBannedDependencies.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestEvaluateBeanshell.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestMavenVersion.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestNoSnapshots.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireOS.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequirePluginVersions.java
maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireProperty.java
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/util/EnforcerUtils.java
Modified:
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/util/EnforcerUtils.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/util/EnforcerUtils.java?rev=571672r1=571671r2=571672view=diff
==
---
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/util/EnforcerUtils.java
(original)
+++
maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/util/EnforcerUtils.java
Fri Aug 31 19:57:05 2007
@@ -12,28 +12,5 @@
*/
public class EnforcerUtils
{
-public static synchronized boolean containsVersion( VersionRange
allowedRange, ArtifactVersion theVersion )
-{
-boolean matched = false;
-ArtifactVersion recommendedVersion =
allowedRange.getRecommendedVersion();
-if ( recommendedVersion == null )
-{
-for ( Iterator i = allowedRange.getRestrictions().iterator();
i.hasNext() !matched; )
-{
-Restriction restriction = (Restriction) i.next();
-if ( restriction.containsVersion( theVersion ) )
-{
-matched = true;
-}
-}
-}
-else
-{
-// only singular versions ever have a recommendedVersion
-int compareTo = recommendedVersion.compareTo( theVersion );
-matched = ( compareTo = 0 );
-}
-return matched;
-}
}
svn commit: r571674 - /maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt
Author: brianf Date: Fri Aug 31 20:19:25 2007 New Revision: 571674 URL: http://svn.apache.org/viewvc?rev=571674view=rev Log: fixed typo Modified: maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt Modified: maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt URL: http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt?rev=571674r1=571673r2=571674view=diff == --- maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt (original) +++ maven/site/trunk/src/site/apt/guides/mini/guide-attached-tests.apt Fri Aug 31 20:19:25 2007 @@ -73,7 +73,7 @@ version1.0-SNAPSHOT/version typetest-jar/type /dependency - /depdendnecies + /dependencies ... /project
svn commit: r571675 - /maven/enforcer/trunk/enforcer-rules/pom.xml
Author: brianf Date: Fri Aug 31 20:25:54 2007 New Revision: 571675 URL: http://svn.apache.org/viewvc?rev=571675view=rev Log: more refactor Modified: maven/enforcer/trunk/enforcer-rules/pom.xml Modified: maven/enforcer/trunk/enforcer-rules/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/pom.xml?rev=571675r1=571674r2=571675view=diff == --- maven/enforcer/trunk/enforcer-rules/pom.xml (original) +++ maven/enforcer/trunk/enforcer-rules/pom.xml Fri Aug 31 20:25:54 2007 @@ -52,6 +52,17 @@ /execution /executions /plugin + plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-jar-plugin/artifactId + executions + execution + goals + goaltest-jar/goal + /goals + /execution + /executions + /plugin /plugins /build dependencies
svn commit: r571676 - in /maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer: DisplayInfoMojo.java EnforceMojo.java EnforceOnceMojo.java
Author: brianf Date: Fri Aug 31 20:28:56 2007 New Revision: 571676 URL: http://svn.apache.org/viewvc?rev=571676view=rev Log: more refactor Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java?rev=571676r1=571675r2=571676view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/DisplayInfoMojo.java Fri Aug 31 20:28:56 2007 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.enforcer; +package org.apache.maven.plugins.enforcer; /* * Licensed to the Apache Software Foundation (ASF) under one Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java?rev=571676r1=571675r2=571676view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java Fri Aug 31 20:28:56 2007 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.enforcer; +package org.apache.maven.plugins.enforcer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -22,15 +22,15 @@ import java.util.ArrayList; import java.util.Iterator; +import org.apache.maven.enforcer.rule.api.EnforcerRule; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.apache.maven.project.path.PathTranslator; -import org.apache.maven.shared.enforcer.rule.api.EnforcerRule; -import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException; -import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper; /** * This goal executes the defined enforcer-rules once per module. Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java?rev=571676r1=571675r2=571676view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceOnceMojo.java Fri Aug 31 20:28:56 2007 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.enforcer; +package org.apache.maven.plugins.enforcer; import org.apache.maven.plugin.MojoExecutionException;
svn commit: r571677 - in /maven/enforcer/trunk/maven-enforcer-plugin: ./ src/test/java/org/apache/maven/plugin/ src/test/java/org/apache/maven/plugins/ src/test/java/org/apache/maven/plugins/enforcer/
Author: brianf Date: Fri Aug 31 20:30:08 2007 New Revision: 571677 URL: http://svn.apache.org/viewvc?rev=571677view=rev Log: more refactor Added: maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/ - copied from r571670, maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/ Removed: maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/ maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/EnforcerTestUtils.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockPathTranslator.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockPlexusContainer.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockRuntimeInformation.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestBannedDependencies.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEvaluateBeanshell.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestMavenVersion.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestRequireJavaVersion.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestRequireOS.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestDefaultEnforcementRuleHelper.java maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java Modified: maven/enforcer/trunk/maven-enforcer-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/pom.xml?rev=571677r1=571676r2=571677view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/pom.xml (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/pom.xml Fri Aug 31 20:30:08 2007 @@ -123,8 +123,20 @@ /dependency dependency groupIdorg.apache.maven.enforcer/groupId -artifactIdmaven-enforcer-rule-api/artifactId +artifactIdenforcer-api/artifactId version1.0-alpha-3-SNAPSHOT/version +/dependency +dependency +groupIdorg.apache.maven.enforcer/groupId +artifactIdenforcer-rules/artifactId + version1.0-SNAPSHOT/version +/dependency +dependency +groupIdorg.apache.maven.enforcer/groupId +artifactIdenforcer-rules/artifactId +version1.0-SNAPSHOT/version +classifiertests/classifier +scopetest/scope /dependency dependency groupIdorg.beanshell/groupId Modified: maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java?rev=571677r1=571670r2=571677view=diff == --- maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java (original) +++ maven/enforcer/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/MockEnforcerRule.java Fri Aug 31 20:30:08 2007 @@ -1,4 +1,4 @@ -package org.apache.maven.plugin.enforcer; +package org.apache.maven.plugins.enforcer; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,9 +19,9 @@ * under the License. */ -import org.apache.maven.shared.enforcer.rule.api.EnforcerRule; -import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException; -import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper; +import org.apache.maven.enforcer.rule.api.EnforcerRule; +import
svn commit: r571011 - /maven/plugins/branches/maven-dependency-plugin-MDEP-71/
Author: brianf Date: Wed Aug 29 18:27:25 2007 New Revision: 571011 URL: http://svn.apache.org/viewvc?rev=571011view=rev Log: made a copy Added: maven/plugins/branches/maven-dependency-plugin-MDEP-71/ - copied from r571010, maven/plugins/trunk/maven-dependency-plugin/
svn commit: r571024 - in /maven/plugins/trunk/maven-enforcer-plugin: ./ src/main/java/org/apache/maven/plugin/enforcer/ src/site/apt/ src/site/apt/rules/ src/test/java/org/apache/maven/plugin/enforcer
Author: brianf
Date: Wed Aug 29 20:27:51 2007
New Revision: 571024
URL: http://svn.apache.org/viewvc?rev=571024view=rev
Log:
MENFORCER-15: added tests and docs
Added:
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/requirePluginVersions.apt
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequirePluginVersions.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/resources/
maven/plugins/trunk/maven-enforcer-plugin/src/test/resources/requirePluginVersions/
maven/plugins/trunk/maven-enforcer-plugin/src/test/resources/requirePluginVersions/getPomRecursively/
maven/plugins/trunk/maven-enforcer-plugin/src/test/resources/requirePluginVersions/getPomRecursively/b/
maven/plugins/trunk/maven-enforcer-plugin/src/test/resources/requirePluginVersions/getPomRecursively/b/c/
maven/plugins/trunk/maven-enforcer-plugin/src/test/resources/requirePluginVersions/getPomRecursively/b/c/pom.xml
maven/plugins/trunk/maven-enforcer-plugin/src/test/resources/requirePluginVersions/getPomRecursively/b/pom.xml
maven/plugins/trunk/maven-enforcer-plugin/src/test/resources/requirePluginVersions/getPomRecursively/pom.xml
Modified:
maven/plugins/trunk/maven-enforcer-plugin/ (props changed)
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/bannedDependencies.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/evaluateBeanshell.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/index.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/noSnapshots.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/requireJavaVersion.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/requireMavenVersion.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/requireOS.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/rules/requireProperty.apt
maven/plugins/trunk/maven-enforcer-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/EnforcerTestUtils.java
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/MockProject.java
Propchange: maven/plugins/trunk/maven-enforcer-plugin/
--
--- svn:ignore (original)
+++ svn:ignore Wed Aug 29 20:27:51 2007
@@ -1,3 +1,5 @@
target
.classpath
.project
+.settings
+cobertura.ser
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java?rev=571024r1=571023r2=571024view=diff
==
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
Wed Aug 29 20:27:51 2007
@@ -122,7 +122,7 @@
List remoteRepositories;
Log log;
-
+
MavenSession session;
public void execute ( EnforcerRuleHelper helper )
@@ -144,8 +144,7 @@
resolver = (ArtifactResolver) helper.getComponent(
ArtifactResolver.class );
local = (ArtifactRepository) helper.evaluate( ${localRepository}
);
remoteRepositories = project.getRemoteArtifactRepositories();
-
-
+
// I couldn't find a direct way to get at the
// lifecycles list.
lifecycles = (List) ReflectionUtils.getValueIncludingSuperclasses(
lifecycles, life );
@@ -158,7 +157,7 @@
log.debug( All Plugins: + allPlugins );
List plugins = getAllPluginEntries( project );
-
+
// now look for the versions that aren't valid
// and add to a list.
ArrayList failures = new ArrayList();
@@ -166,7 +165,7 @@
while ( iter.hasNext() )
{
Plugin plugin = (Plugin) iter.next();
-if ( !hasVersionSpecified( plugin, plugins ))
+if ( !hasVersionSpecified( plugin, plugins ) )
{
failures.add( plugin );
}
@@ -184,7 +183,7 @@
Plugin plugin = (Plugin) iter.next();
newMsg.append( plugin.getGroupId() + : +
plugin.getArtifactId() + \n );
}
-if (StringUtils.isNotEmpty( message ))
+if ( StringUtils.isNotEmpty( message ) )
{
newMsg.append( message
svn commit: r570611 [3/14] - in /maven/sandbox/trunk/archetypeng: ./ archetype-common/ archetype-common/src/ archetype-common/src/main/ archetype-common/src/main/java/ archetype-common/src/main/java/o
Added:
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java?rev=570611view=auto
==
---
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
(added)
+++
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
Tue Aug 28 19:32:45 2007
@@ -0,0 +1,455 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.maven.archetype.common;
+
+import org.apache.maven.archetype.exception.InvalidPackaging;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.Reporting;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.Node;
+
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
+
+import org.jdom.JDOMException;
+
+import org.jdom.input.SAXBuilder;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @plexus.component
+ */
+public class DefaultPomManager
+extends AbstractLogEnabled
+implements PomManager
+{
+public void addModule ( File pom, String artifactId )
+throws FileNotFoundException,
+IOException,
+XmlPullParserException,
+DocumentException,
+InvalidPackaging
+{
+boolean found = false;
+
+StringWriter writer = new StringWriter ();
+Reader fileReader = new FileReader ( pom );
+
+try
+{
+fileReader = new FileReader ( pom );
+
+SAXReader reader = new SAXReader ();
+Document document = reader.read ( fileReader );
+Element project = document.getRootElement ();
+
+String packaging = null;
+Element packagingElement = project.element ( packaging );
+if ( packagingElement != null )
+{
+packaging = packagingElement.getStringValue ();
+}
+if ( !pom.equals ( packaging ) )
+{
+throw new InvalidPackaging (
+Unable to add module to the current project as it is not
of packaging type 'pom'
+);
+}
+
+Element modules = project.element ( modules );
+if ( modules == null )
+{
+modules = project.addText ().addElement ( modules );
+modules.setText ( \n );
+project.addText ( \n );
+}
+// TODO: change to while loop
+for ( Iterator i = modules.elementIterator ( module ); i.hasNext
() !found; )
+{
+Element module = (Element) i.next ();
+if ( module.getText ().equals ( artifactId ) )
+{
+found = true;
+}
+}
+if ( !found )
+{
+Node lastTextNode = null;
+for ( Iterator i = modules.nodeIterator ();
svn commit: r570611 [14/14] - in /maven/sandbox/trunk/archetypeng: ./ archetype-common/ archetype-common/src/ archetype-common/src/main/ archetype-common/src/main/java/ archetype-common/src/main/java/
Added: maven/sandbox/trunk/archetypeng/src/site/apt/archetypes.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/src/site/apt/archetypes.apt?rev=570611view=auto
==
--- maven/sandbox/trunk/archetypeng/src/site/apt/archetypes.apt (added)
+++ maven/sandbox/trunk/archetypeng/src/site/apt/archetypes.apt Tue Aug 28
19:32:45 2007
@@ -0,0 +1,39 @@
+ -
+ Archetypeng - Archetypes
+ -
+ The Maven Team
+ -
+
+Archetypes
+
+An archetype is a {{{#Descriptor}descriptor}} and a set of
+{{{#Templates}templates}}. There is two kind of archetypes: complete and
+partial.
+
+A complete archetype represents a Maven 2 project with complete features.
+Eg. a class library, a desktop application, a web application.
+
+A partial archetype represents an added feature to an existing Maven 2
+project. Eg. using modello, using jetty.
+
+The archetype is packaged in a jar file.
+
+Archetypes can be created using the {{{creation.html}creation}} mecanism
or
+can be {{{archetype-handcraft.html}handcrafted}}.
+
+* {Descriptor}
+
+The archetype descriptor is an xml file defining:
+
+* the archetype name,
+
+* the properties needed by the templates,
+
+* the templates used to generate the project sorted by categories.
+
+[]
+
+* {Templates}
+
+The templates are velocity template files. They are used to generate the
+sources of the project.
Added: maven/sandbox/trunk/archetypeng/src/site/apt/creation.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/src/site/apt/creation.apt?rev=570611view=auto
==
--- maven/sandbox/trunk/archetypeng/src/site/apt/creation.apt (added)
+++ maven/sandbox/trunk/archetypeng/src/site/apt/creation.apt Tue Aug 28
19:32:45 2007
@@ -0,0 +1,256 @@
+ -
+ Archetypeng - Creation
+ -
+ The Maven Team
+ -
+
+Creation
+
+Creating an archetype from a project involves two steps:
+
+* the configuration of the archetype
+
+* and the effective creation based on the collected information.
+
+[]
+
+At the end of these steps, you have a Maven 2 archetype created in the
+target/generated-sources/archetypeng directory.
+
+It is possible to use the generation plugin in {{{#Batch}batch}} mode.
+
+* Archetype configuration
+
+During this step, you are successivly prompted to:
+
+* define the archetype's groupId, artifactId and version,
+
+* define the common properties' values (used for reverse templating),
+
+* define the archetype's properties and values (used for reverse
templating),
+
+* confirm the configuration.
+
+[]
+
+A properety file containing the archetype definition and the archetype's
+properties is written at the end of this step.
+
+The packageName property provides a default value of the guessed package of
+the project based on the packages of the project's sources.
+
+* Archetype creation
+
+During this step, the plugin creates a Maven 2 archetype based on the
+project's sources and pom and on the configuration collected.
+
+
+* Example of use
+
+To create an archetype, call mvn archetypeng:create-from-project.
+
+
++--
[EMAIL PROTECTED] test-start]$ tree
+.
+|-- pom.xml
+`-- src
+|-- main
+| `-- java
+| `-- org
+| `-- codehaus
+| `-- mojo
+| `-- archetypeng
+| `-- test
+| `-- start
+| `-- App.java
+`-- test
+`-- java
+`-- org
+`-- codehaus
+`-- mojo
+`-- archetypeng
+`-- test
+`-- start
+`-- AppTest.java
+
+17 directories, 3 files
++--
+
+Here is a sample project (the one generated by the
+{{{generation.html}generation}} :-)).
+
++--
[EMAIL PROTECTED] test-start]$ mvn archetypeng:create-from-project
+[INFO] Scanning for projects...
+[INFO] Searching repository for plugin with prefix: 'archetypeng'.
+[INFO] artifact org.codehaus.mojo:maven-archetypeng-plugin: checking for
updates from central
+[INFO]
+[INFO] Building test-start
+[INFO]task-segment: [archetypeng:create-from-project]
+[INFO]
+[INFO] Preparing archetypeng:create-from-project
++--
+
+The first step of the creation: configure-creation
+
++--
+[INFO] [archetypeng:configure-creation]
+Define value for archetype.groupId: org.codehaus.mojo.archetypeng.test: :
+Define value for archetype.artifactId: test-start-archetype: :
+Define value for archetype.version: 1.0-SNAPSHOT: :
+Define value
svn commit: r570614 - /maven/sandbox/trunk/archetypeng/
Author: brianf Date: Tue Aug 28 19:40:17 2007 New Revision: 570614 URL: http://svn.apache.org/viewvc?rev=570614view=rev Log: (empty) Removed: maven/sandbox/trunk/archetypeng/
svn commit: r570618 [3/14] - in /maven/sandbox/trunk/archetypeng: ./ archetype-common/ archetype-common/src/ archetype-common/src/main/ archetype-common/src/main/java/ archetype-common/src/main/java/o
Added:
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java?rev=570618view=auto
==
---
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
(added)
+++
maven/sandbox/trunk/archetypeng/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultPomManager.java
Tue Aug 28 19:43:33 2007
@@ -0,0 +1,455 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.maven.archetype.common;
+
+import org.apache.maven.archetype.exception.InvalidPackaging;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.Reporting;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
+
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.Node;
+
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
+
+import org.jdom.JDOMException;
+
+import org.jdom.input.SAXBuilder;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @plexus.component
+ */
+public class DefaultPomManager
+extends AbstractLogEnabled
+implements PomManager
+{
+public void addModule ( File pom, String artifactId )
+throws FileNotFoundException,
+IOException,
+XmlPullParserException,
+DocumentException,
+InvalidPackaging
+{
+boolean found = false;
+
+StringWriter writer = new StringWriter ();
+Reader fileReader = new FileReader ( pom );
+
+try
+{
+fileReader = new FileReader ( pom );
+
+SAXReader reader = new SAXReader ();
+Document document = reader.read ( fileReader );
+Element project = document.getRootElement ();
+
+String packaging = null;
+Element packagingElement = project.element ( packaging );
+if ( packagingElement != null )
+{
+packaging = packagingElement.getStringValue ();
+}
+if ( !pom.equals ( packaging ) )
+{
+throw new InvalidPackaging (
+Unable to add module to the current project as it is not
of packaging type 'pom'
+);
+}
+
+Element modules = project.element ( modules );
+if ( modules == null )
+{
+modules = project.addText ().addElement ( modules );
+modules.setText ( \n );
+project.addText ( \n );
+}
+// TODO: change to while loop
+for ( Iterator i = modules.elementIterator ( module ); i.hasNext
() !found; )
+{
+Element module = (Element) i.next ();
+if ( module.getText ().equals ( artifactId ) )
+{
+found = true;
+}
+}
+if ( !found )
+{
+Node lastTextNode = null;
+for ( Iterator i = modules.nodeIterator ();
svn commit: r570618 [14/14] - in /maven/sandbox/trunk/archetypeng: ./ archetype-common/ archetype-common/src/ archetype-common/src/main/ archetype-common/src/main/java/ archetype-common/src/main/java/
Added: maven/sandbox/trunk/archetypeng/src/site/apt/archetypes.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/src/site/apt/archetypes.apt?rev=570618view=auto
==
--- maven/sandbox/trunk/archetypeng/src/site/apt/archetypes.apt (added)
+++ maven/sandbox/trunk/archetypeng/src/site/apt/archetypes.apt Tue Aug 28
19:43:33 2007
@@ -0,0 +1,39 @@
+ -
+ Archetypeng - Archetypes
+ -
+ The Maven Team
+ -
+
+Archetypes
+
+An archetype is a {{{#Descriptor}descriptor}} and a set of
+{{{#Templates}templates}}. There is two kind of archetypes: complete and
+partial.
+
+A complete archetype represents a Maven 2 project with complete features.
+Eg. a class library, a desktop application, a web application.
+
+A partial archetype represents an added feature to an existing Maven 2
+project. Eg. using modello, using jetty.
+
+The archetype is packaged in a jar file.
+
+Archetypes can be created using the {{{creation.html}creation}} mecanism
or
+can be {{{archetype-handcraft.html}handcrafted}}.
+
+* {Descriptor}
+
+The archetype descriptor is an xml file defining:
+
+* the archetype name,
+
+* the properties needed by the templates,
+
+* the templates used to generate the project sorted by categories.
+
+[]
+
+* {Templates}
+
+The templates are velocity template files. They are used to generate the
+sources of the project.
Added: maven/sandbox/trunk/archetypeng/src/site/apt/creation.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/archetypeng/src/site/apt/creation.apt?rev=570618view=auto
==
--- maven/sandbox/trunk/archetypeng/src/site/apt/creation.apt (added)
+++ maven/sandbox/trunk/archetypeng/src/site/apt/creation.apt Tue Aug 28
19:43:33 2007
@@ -0,0 +1,256 @@
+ -
+ Archetypeng - Creation
+ -
+ The Maven Team
+ -
+
+Creation
+
+Creating an archetype from a project involves two steps:
+
+* the configuration of the archetype
+
+* and the effective creation based on the collected information.
+
+[]
+
+At the end of these steps, you have a Maven 2 archetype created in the
+target/generated-sources/archetypeng directory.
+
+It is possible to use the generation plugin in {{{#Batch}batch}} mode.
+
+* Archetype configuration
+
+During this step, you are successivly prompted to:
+
+* define the archetype's groupId, artifactId and version,
+
+* define the common properties' values (used for reverse templating),
+
+* define the archetype's properties and values (used for reverse
templating),
+
+* confirm the configuration.
+
+[]
+
+A properety file containing the archetype definition and the archetype's
+properties is written at the end of this step.
+
+The packageName property provides a default value of the guessed package of
+the project based on the packages of the project's sources.
+
+* Archetype creation
+
+During this step, the plugin creates a Maven 2 archetype based on the
+project's sources and pom and on the configuration collected.
+
+
+* Example of use
+
+To create an archetype, call mvn archetypeng:create-from-project.
+
+
++--
[EMAIL PROTECTED] test-start]$ tree
+.
+|-- pom.xml
+`-- src
+|-- main
+| `-- java
+| `-- org
+| `-- codehaus
+| `-- mojo
+| `-- archetypeng
+| `-- test
+| `-- start
+| `-- App.java
+`-- test
+`-- java
+`-- org
+`-- codehaus
+`-- mojo
+`-- archetypeng
+`-- test
+`-- start
+`-- AppTest.java
+
+17 directories, 3 files
++--
+
+Here is a sample project (the one generated by the
+{{{generation.html}generation}} :-)).
+
++--
[EMAIL PROTECTED] test-start]$ mvn archetypeng:create-from-project
+[INFO] Scanning for projects...
+[INFO] Searching repository for plugin with prefix: 'archetypeng'.
+[INFO] artifact org.codehaus.mojo:maven-archetypeng-plugin: checking for
updates from central
+[INFO]
+[INFO] Building test-start
+[INFO]task-segment: [archetypeng:create-from-project]
+[INFO]
+[INFO] Preparing archetypeng:create-from-project
++--
+
+The first step of the creation: configure-creation
+
++--
+[INFO] [archetypeng:configure-creation]
+Define value for archetype.groupId: org.codehaus.mojo.archetypeng.test: :
+Define value for archetype.artifactId: test-start-archetype: :
+Define value for archetype.version: 1.0-SNAPSHOT: :
+Define value
svn commit: r569672 - in /maven/site/trunk/src/site/apt: guides/introduction/introduction-to-dependency-mechanism.apt plugins/index.apt
Author: brianf
Date: Sat Aug 25 06:55:17 2007
New Revision: 569672
URL: http://svn.apache.org/viewvc?rev=569672view=rev
Log:
applied patch from MNGSITE-23 and updated enforcer,eclipse plugin versions
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
maven/site/trunk/src/site/apt/plugins/index.apt
Modified:
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt?rev=569672r1=569671r2=569672view=diff
==
---
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
(original)
+++
maven/site/trunk/src/site/apt/guides/introduction/introduction-to-dependency-mechanism.apt
Sat Aug 25 06:55:17 2007
@@ -96,9 +96,9 @@
[]
Each of the scopes affects transitive dependencies in different ways, as is
demonstrated in the table below.
- If a dependency is set to the scope in the left column, dependencies with the
scope across the top row will
- result in a dependency in the main project with the scope listed at the
intersection. If no scope is listed,
- it means the dependency will be omitted.
+ If a dependency is set to the scope in the left column, transitive
dependencies of that dependency with the
+ scope across the top row will result in a dependency in the main project with
the scope listed at the
+ intersection. If no scope is listed, it means the dependency will be omitted.
*--++--+--+--+
| | compile| provided | runtime | test
@@ -434,4 +434,5 @@
...
/project
++
+
Modified: maven/site/trunk/src/site/apt/plugins/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/plugins/index.apt?rev=569672r1=569671r2=569672view=diff
==
--- maven/site/trunk/src/site/apt/plugins/index.apt (original)
+++ maven/site/trunk/src/site/apt/plugins/index.apt Sat Aug 25 06:55:17 2007
@@ -4,7 +4,7 @@
Brett Porter
Jason van Zyl
-
- 9 April 2005
+ 10 July 2007
-
Available Plugins
@@ -87,7 +87,7 @@
*---+---+--+
| {{{maven-dependency-plugin/} dependency}} | 2.0-alpha-4 |
Dependency manipulation (copy, unpack) and analysis.
*---++--+
-| {{{maven-enforcer-plugin/} enforcer}} | 1.0-alpha-2 |
Environmental constraint checking (Maven Version, JDK etc).
+| {{{maven-enforcer-plugin/} enforcer}} | 1.0-alpha-3 |
Environmental constraint checking (Maven Version, JDK etc), User Custom Rule
Execution.
*---++--+
| {{{maven-gpg-plugin/} gpg}} | 1.0-alpha-3 |
Create signatures for the artifacts and poms
*---++--+
@@ -113,7 +113,7 @@
*---*+--+
| IDEs | | Plugins that simplify integration with integrated developer
environments.
*---++--+
-| {{{maven-eclipse-plugin/} eclipse}} | 2.3|
Generate an Eclipse project file for the current project.
+| {{{maven-eclipse-plugin/} eclipse}} | 2.4|
Generate an Eclipse project file for the current project.
*---++--+
| {{{maven-idea-plugin/} idea}} | 2.1|
Create/update an IDEA workspace for the current project (individual modules are
created as IDEA modules)
*---++--+
svn commit: r568343 - in /maven/core-integration-testing/trunk/maven-integration-test-archetype: pom.xml src/main/resources/META-INF/maven/archetype-metadata.xml
Author: brianf Date: Tue Aug 21 17:47:43 2007 New Revision: 568343 URL: http://svn.apache.org/viewvc?rev=568343view=rev Log: updated archetype Modified: maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Modified: maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml?rev=568343r1=568342r2=568343view=diff == --- maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml (original) +++ maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml Tue Aug 21 17:47:43 2007 @@ -1,12 +1,12 @@ ?xml version=1.0 encoding=UTF-8?project modelVersion4.0.0/modelVersion - parent +parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId -version6-SNAPSHOT/version +version5/version /parent - groupIdorg.apache.maven.archetypes/groupId - artifactIdmaven-integration-test-archetype/artifactId + groupIdorg.apache.maven.it.sample/groupId + artifactIdmaven-integration-test-sample-archetype/artifactId packagingmaven-archetype/packaging version1.0-SNAPSHOT/version build Modified: maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=568343r1=568342r2=568343view=diff == --- maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (original) +++ maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Tue Aug 21 17:47:43 2007 @@ -14,12 +14,6 @@ include**/*.xml/include /includes /fileSet -fileSet encoding=UTF-8 - directorysrc/test/resources/directory - includes -include**/*.jar/include - /includes -/fileSet fileSet filtered=true encoding=UTF-8 directory/directory includes
svn commit: r568344 - in /maven/core-integration-testing/trunk: maven-integration-test-archetype/pom.xml maven-integration-test-sample/pom.xml
Author: brianf Date: Tue Aug 21 17:55:12 2007 New Revision: 568344 URL: http://svn.apache.org/viewvc?rev=568344view=rev Log: renamed groups to match existing its groups Modified: maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml maven/core-integration-testing/trunk/maven-integration-test-sample/pom.xml Modified: maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml?rev=568344r1=568343r2=568344view=diff == --- maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml (original) +++ maven/core-integration-testing/trunk/maven-integration-test-archetype/pom.xml Tue Aug 21 17:55:12 2007 @@ -5,7 +5,7 @@ artifactIdmaven-parent/artifactId version5/version /parent - groupIdorg.apache.maven.it.sample/groupId + groupIdorg.apache.maven.its/groupId artifactIdmaven-integration-test-sample-archetype/artifactId packagingmaven-archetype/packaging version1.0-SNAPSHOT/version Modified: maven/core-integration-testing/trunk/maven-integration-test-sample/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test-sample/pom.xml?rev=568344r1=568343r2=568344view=diff == --- maven/core-integration-testing/trunk/maven-integration-test-sample/pom.xml (original) +++ maven/core-integration-testing/trunk/maven-integration-test-sample/pom.xml Tue Aug 21 17:55:12 2007 @@ -1,6 +1,6 @@ project modelVersion4.0.0/modelVersion - groupIdorg.apache.maven.it.sample/groupId + groupIdorg.apache.maven.its/groupId artifactIdmaven-integration-test-sample/artifactId version1.0-SNAPSHOT/version nameMaven Integration Tests/name
svn commit: r566176 - /maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
Author: brianf
Date: Wed Aug 15 07:10:35 2007
New Revision: 566176
URL: http://svn.apache.org/viewvc?view=revrev=566176
Log:
fixed class name.
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java?view=diffrev=566176r1=566175r2=566176
==
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequirePluginVersions.java
Wed Aug 15 07:10:35 2007
@@ -76,7 +76,7 @@
* This rule will enforce that all plugins specified in the
* poms have a version declared.
*/
-public class PluginVersionsDefined
+public class RequirePluginVersions
implements EnforcerRule
{
svn commit: r565767 - in /maven/plugins/trunk/maven-enforcer-plugin/src: it/ main/java/org/apache/maven/plugin/enforcer/
Author: brianf Date: Tue Aug 14 07:19:43 2007 New Revision: 565767 URL: http://svn.apache.org/viewvc?view=revrev=565767 Log: new rule for checking plugin versions Added: maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java Modified: maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/AbstractBanDependencies.java maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/BannedDependencies.java maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EnforceMojo.java maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/NoSnapshots.java Modified: maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml?view=diffrev=565767r1=565766r2=565767 == --- maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml (original) +++ maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml Tue Aug 14 07:19:43 2007 @@ -3,7 +3,7 @@ groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin-it1/artifactId version1/version - packagingpom/packaging + packagingjar/packaging dependencies dependency groupIdorg.apache.maven.shared/groupId @@ -16,6 +16,18 @@ plugins plugin groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-dependency-plugin/artifactId + executions + execution + idcopy/id + goals + goalcopy-dependencies/goal + /goals + /execution + /executions + /plugin + plugin + groupIdorg.apache.maven.plugins/groupId artifactIdmaven-enforcer-plugin/artifactId dependencies dependency @@ -29,7 +41,7 @@ idenforce/id configuration rules - requireJavaVersion + !--requireJavaVersion version[1.3,1.6]/version /requireJavaVersion requireMavenVersion @@ -42,20 +54,23 @@ requireOS family!tandem/family /requireOS - !--evaluateBeanshell + evaluateBeanshell conditionrti.getApplicationVersion().getMajorVersion() == 2;/condition - /evaluateBeanshell-- + /evaluateBeanshell noSnapshots/ bannedDependencies excludes excludeorg.apache.maven/exclude /excludes - /bannedDependencies + /bannedDependencies-- + pluginVersionsDefined + /pluginVersionsDefined /rules /configuration goals - goalenforce-once/goal
svn commit: r566018 - in /maven/plugins/trunk/maven-enforcer-plugin/src: it/pom.xml main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java
Author: brianf
Date: Tue Aug 14 21:18:02 2007
New Revision: 566018
URL: http://svn.apache.org/viewvc?view=revrev=566018
Log:
finished up the plugin version rule
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java
Modified: maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml?view=diffrev=566018r1=566017r2=566018
==
--- maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml (original)
+++ maven/plugins/trunk/maven-enforcer-plugin/src/it/pom.xml Tue Aug 14
21:18:02 2007
@@ -13,10 +13,20 @@
/dependencies
build
+ pluginManagement
+ plugins
+ plugin
+
groupIdorg.apache.maven.plugins/groupId
+
artifactIdmaven-compiler-plugin/artifactId
+ version2.0.2/version
+ /plugin
+ /plugins
+ /pluginManagement
plugins
plugin
groupIdorg.apache.maven.plugins/groupId
artifactIdmaven-dependency-plugin/artifactId
+ version2.0-alpha-4/version
executions
execution
idcopy/id
Modified:
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java?view=diffrev=566018r1=566017r2=566018
==
---
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java
(original)
+++
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/PluginVersionsDefined.java
Tue Aug 14 21:18:02 2007
@@ -19,6 +19,10 @@
* under the License.
*/
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -28,23 +32,23 @@
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
-import java.io.File;
-import java.io.Reader;
-import java.io.FileReader;
-import java.io.IOException;
import org.apache.maven.BuildFailureException;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.Lifecycle;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.mapping.LifecycleMapping;
-import org.apache.maven.model.Plugin;
import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.Plugin;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.InvalidPluginException;
import org.apache.maven.plugin.PluginManager;
@@ -109,25 +113,41 @@
private List lifecycles;
+ArtifactFactory factory;
+
+ArtifactResolver resolver;
+
+ArtifactRepository local;
+
+List remoteRepositories;
+
Log log;
+
+MavenSession session;
public void execute ( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
log = helper.getLog();
-
MavenProject project;
try
{
-// get the various expressions out of the helper.
+// get the various expressions out of the
+// helper.
project = (MavenProject) helper.evaluate( ${project} );
LifecycleExecutor life;
life = (LifecycleExecutor) helper.getComponent(
LifecycleExecutor.class );
-MavenSession session = (MavenSession) helper.evaluate(
${session} );
+session = (MavenSession) helper.evaluate( ${session} );
pluginManager = (PluginManager) helper.getComponent(
PluginManager.class );
-
-//I couldn't find a direct way to get at the lifecycles list
svn commit: r564450 - /maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml
Author: brianf Date: Thu Aug 9 18:18:26 2007 New Revision: 564450 URL: http://svn.apache.org/viewvc?view=revrev=564450 Log: fixed version and bound plugin to test Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml?view=diffrev=564450r1=564449r2=564450 == --- maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/resolve/pom.xml Thu Aug 9 18:18:26 2007 @@ -37,14 +37,20 @@ /dependencies !--This must be set so the correct version is used for the IT test-- build -pluginManagement plugins -plugin - groupIdorg.apache.maven.plugins/groupId - artifactIdmaven-dependency-plugin/artifactId - versiontest/version -/plugin - /plugins -/pluginManagement + plugin + groupIdorg.apache.maven.plugins/groupId + artifactIdmaven-dependency-plugin/artifactId + executions + execution + idresolve/id + phasegenerate-sources/phase + goals +goalresolve/goal + /goals + /execution + /executions + /plugin +/plugins /build /project
svn commit: r563723 - in /maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache: dependency/ dependency/HelloWorld.java dependency/HelloWorld2.
Author: brianf
Date: Tue Aug 7 19:29:10 2007
New Revision: 563723
URL: http://svn.apache.org/viewvc?view=revrev=563723
Log: (empty)
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld.java
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld2.java
Removed:
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependencyTest/
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld.java?view=autorev=563723
==
---
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld.java
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld.java
Tue Aug 7 19:29:10 2007
@@ -0,0 +1,28 @@
+package org.apache.dependency;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class HelloWorld
+{
+ public void foo()
+ {
+ System.out.println(Hello World);
+ }
+}
Added:
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld2.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld2.java?view=autorev=563723
==
---
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld2.java
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/resources/its/siblingReference/a/src/main/java/org/apache/dependency/HelloWorld2.java
Tue Aug 7 19:29:10 2007
@@ -0,0 +1,28 @@
+package org.apache.dependency;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class HelloWorld2
+{
+ public void foo()
+ {
+ System.out.println(Hello World2);
+ }
+}
svn commit: r562307 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
Author: brianf
Date: Thu Aug 2 17:42:51 2007
New Revision: 562307
URL: http://svn.apache.org/viewvc?view=revrev=562307
Log:
fixed MECLIPSE-292
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java?view=diffrev=562307r1=562306r2=562307
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
Thu Aug 2 17:42:51 2007
@@ -946,7 +946,7 @@
artifactFactory, remoteRepos, getLog() );
if ( artifact.isResolved() )
{
-if ( sources.equals( classifier ) )
+if ( sources.equals( classifier ) )
{
dependency.setSourceAttachment( artifact.getFile() );
}
@@ -954,20 +954,20 @@
{
dependency.setJavadocAttachment( artifact.getFile() );
}
-else
-{
-unavailableArtifactsCache.put( dependency.getId() +
: + classifier, Boolean.TRUE.toString() );
-// add the dependencies to the list
-// of those lacking the required
-// artifact
-missingClassifierDependencies.add( dependency );
-}
}
-
+else
+{
+unavailableArtifactsCache.put( dependency.getId() + : +
classifier, Boolean.TRUE.toString() );
+// add the dependencies to the list
+// of those lacking the required
+// artifact
+missingClassifierDependencies.add( dependency );
+}
}
}
-// return the list of dependencies missing the required artifact
+// return the list of dependencies missing the
+// required artifact
return missingClassifierDependencies;
}
svn commit: r562010 [2/2] - in /maven/core-integration-testing/trunk: maven-integration-test-archetype/ maven-integration-test-archetype/src/ maven-integration-test-archetype/src/main/ maven-integrati
Propchange: maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/checkstyle-assembly-1.0.jar -- svn:mime-type = application/octet-stream Added: maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/classes/rule_set.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/classes/rule_set.xml?view=autorev=562010 == --- maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/classes/rule_set.xml (added) +++ maven/core-integration-testing/trunk/maven-integration-test-archetype/src/main/resources/archetype-resources/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/target/classes/rule_set.xml Wed Aug 1 20:50:20 2007 @@ -0,0 +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
svn commit: r558907 - /maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml
Author: brianf Date: Mon Jul 23 18:29:04 2007 New Revision: 558907 URL: http://svn.apache.org/viewvc?view=revrev=558907 Log: extend maven parent and deploy snapshot for archetype Modified: maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml Modified: maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml?view=diffrev=558907r1=558906r2=558907 == --- maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml (original) +++ maven/core-integration-testing/trunk/maven-integration-test-helper/pom.xml Mon Jul 23 18:29:04 2007 @@ -1,5 +1,10 @@ project modelVersion4.0.0/modelVersion + parent +groupIdorg.apache.maven/groupId +artifactIdmaven-parent/artifactId +version6-SNAPSHOT/version + /parent groupIdorg.apache.maven.its/groupId artifactIdmaven-integration-test-helper/artifactId version1.0-SNAPSHOT/version
svn commit: r558915 - in /maven/core-integration-testing/trunk/maven-integration-test: ./ src/test/java/org/apache/maven/integrationtests/ src/test/resources/it0111-pluginThatRequiresResourceFromAnExt
Author: brianf Date: Mon Jul 23 19:20:12 2007 New Revision: 558915 URL: http://svn.apache.org/viewvc?view=revrev=558915 Log: changes to sample to make it generic and self documenting Added: maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenITmngDescriptionOfProblemTest.java - copied, changed from r557106, maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/ - copied from r557106, maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/ maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/readme.txt Removed: maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/it0111-pluginThatRequiresResourceFromAnExtension/ Modified: maven/core-integration-testing/trunk/maven-integration-test/ (props changed) maven/core-integration-testing/trunk/maven-integration-test/pom.xml maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/ (props changed) maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/checkstyle-assembly/pom.xml maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/checkstyle-test/pom.xml maven/core-integration-testing/trunk/maven-integration-test/src/test/resources/mng--descriptionOfProblem/pom.xml Propchange: maven/core-integration-testing/trunk/maven-integration-test/ -- --- svn:ignore (added) +++ svn:ignore Mon Jul 23 19:20:12 2007 @@ -0,0 +1 @@ +target Modified: maven/core-integration-testing/trunk/maven-integration-test/pom.xml URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test/pom.xml?view=diffrev=558915r1=558914r2=558915 == --- maven/core-integration-testing/trunk/maven-integration-test/pom.xml (original) +++ maven/core-integration-testing/trunk/maven-integration-test/pom.xml Mon Jul 23 19:20:12 2007 @@ -11,10 +11,10 @@ version1.0/version /dependency dependency - groupIdorg.apache.maven.its/groupId - artifactIdmaven-integration-test-helper/artifactId - version1.0-SNAPSHOT/version -/dependency + groupIdorg.apache.maven.its/groupId + artifactIdmaven-integration-test-helper/artifactId + version1.0-SNAPSHOT/version + /dependency dependency groupIdjunit/groupId artifactIdjunit/artifactId @@ -22,4 +22,17 @@ scopetest/scope /dependency /dependencies + !-- TODO: remove when snapshots are released -- + repositories + repository + idapache.snapshots/id + urlhttp://people.apache.org/repo/m2-snapshot-repository/url + releases + enabledfalse/enabled + /releases + snapshots + enabledtrue/enabled + /snapshots + /repository + /repositories /project Copied: maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenITmngDescriptionOfProblemTest.java (from r557106, maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java) URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenITmngDescriptionOfProblemTest.java?view=diffrev=558915p1=maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.javar1=557106p2=maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenITmngDescriptionOfProblemTest.javar2=558915 == --- maven/core-integration-testing/trunk/maven-integration-test/src/test/java/org/apache/maven/integrationtests/MavenIT0111PluginsThatRequireAResourceFromAnExtensionTest.java (original) +++ maven/core-integration
svn commit: r558082 - /maven/plugins/branches/maven-dependency-plugin-MDEP-47/
Author: brianf Date: Fri Jul 20 11:28:54 2007 New Revision: 558082 URL: http://svn.apache.org/viewvc?view=revrev=558082 Log: Removed file/folder Removed: maven/plugins/branches/maven-dependency-plugin-MDEP-47/
svn commit: r558084 - /maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-292/
Author: brianf Date: Fri Jul 20 11:30:45 2007 New Revision: 558084 URL: http://svn.apache.org/viewvc?view=revrev=558084 Log: Removed file/folder Removed: maven/plugins/branches/maven-eclipse-plugin-MECLIPSE-292/
svn commit: r558085 - /maven/plugins/branches/maven-eclipse-plugin-151-287/
Author: brianf Date: Fri Jul 20 11:31:11 2007 New Revision: 558085 URL: http://svn.apache.org/viewvc?view=revrev=558085 Log: Removed file/folder Removed: maven/plugins/branches/maven-eclipse-plugin-151-287/
svn commit: r558086 - /maven/plugins/branches/MECLIPSE-295-minimal-config/
Author: brianf Date: Fri Jul 20 11:31:40 2007 New Revision: 558086 URL: http://svn.apache.org/viewvc?view=revrev=558086 Log: Removed file/folder Removed: maven/plugins/branches/MECLIPSE-295-minimal-config/
svn commit: r557829 - in /maven/plugins/branches/maven-dependency-plugin-MDEP-47/src: main/java/org/apache/maven/plugin/dependency/ main/java/org/apache/maven/plugin/dependency/fromConfiguration/ site
Author: brianf
Date: Thu Jul 19 17:55:05 2007
New Revision: 557829
URL: http://svn.apache.org/viewvc?view=revrev=557829
Log:
applied patch from Damian Bradicich for MDEP-47
Modified:
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/site/apt/examples/unpacking-artifacts.apt
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/site/apt/examples/unpacking-project-dependencies.apt
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/site/apt/usage.apt
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/test/java/org/apache/maven/plugin/dependency/utils/markers/TestUnpackMarkerFileHandler.java
Modified:
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java?view=diffrev=557829r1=557828r2=557829
==
---
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
(original)
+++
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
Thu Jul 19 17:55:05 2007
@@ -47,7 +47,7 @@
{
/**
* A comma separated list of file patterns to include when unpacking the
- * artifact.
+ * artifact. i.e. **\/*.xml,**\/*.properties
*
* @parameter expression=${mdep.unpack.includes}
*/
@@ -55,7 +55,7 @@
/**
* A comma separated list of file patterns to exclude when unpacking the
- * artifact.
+ * artifact. i.e. **\/*.xml,**\/*.properties
*
* @parameter expression=${mdep.unpack.excludes}
*/
Modified:
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java?view=diffrev=557829r1=557828r2=557829
==
---
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
(original)
+++
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/ArtifactItem.java
Thu Jul 19 17:55:05 2007
@@ -104,16 +104,12 @@
/**
* A comma separated list of file patterns to include when unpacking the
* artifact.
- *
- * @parameter expression=${mdep.artifact.item.unpack.includes}
*/
private String includes;
/**
* A comma separated list of file patterns to exclude when unpacking the
* artifact.
- *
- * @parameter expression=${mdep.artifact.item.unpack.excludes}
*/
private String excludes;
Modified:
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java?view=diffrev=557829r1=557828r2=557829
==
---
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
(original)
+++
maven/plugins/branches/maven-dependency-plugin-MDEP-47/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
Thu Jul 19 17:55:05 2007
@@ -57,15 +57,15 @@
/**
* A comma separated list of file patterns to include when unpacking the
- * artifact.
- *
+ * artifact. i.e. **\/*.xml,**\/*.properties
+ *
* @parameter expression=${mdep.unpack.includes}
*/
private String includes;
/**
* A comma separated list of file patterns to exclude when unpacking the
- * artifact.
+ * artifact. i.e. **\/*.xml,**\/*.properties
*
* @parameter expression=${mdep.unpack.excludes}
*/
@@ -118,22
