svn commit: r757763 - /maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt
Author: dennisl
Date: Tue Mar 24 12:34:31 2009
New Revision: 757763
URL: http://svn.apache.org/viewvc?rev=757763view=rev
Log:
o Fix broken link.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt
Modified: maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt?rev=757763r1=757762r2=757763view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/site/apt/index.apt Tue Mar 24
12:34:31 2009
@@ -46,7 +46,7 @@
* {{{jira-report-mojo.html}changes:jira-report}} create a report from issues
downloaded from JIRA.
- * {{{changes-validate-mojo.html.html}changes:changes-validate}} validate the
changes.xml file.
+ * {{{changes-validate-mojo.html}changes:changes-validate}} validate the
changes.xml file.
[]
svn commit: r757777 - in /maven/plugins/trunk/maven-changes-plugin/src/main: java/org/apache/maven/plugin/changes/ChangesReportGenerator.java resources/changes-report.properties resources/changes-repo
Author: dennisl
Date: Tue Mar 24 13:09:48 2009
New Revision: 75
URL: http://svn.apache.org/viewvc?rev=75view=rev
Log:
[MCHANGES-156] An empty table is shown for a release which doesn't have any
action in it
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report.properties
maven/plugins/trunk/maven-changes-plugin/src/main/resources/changes-report_de.properties
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=75r1=757776r2=75view=diff
==
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
Tue Mar 24 13:09:48 2009
@@ -176,70 +176,81 @@
private void constructActions( Sink sink, List actionList, ResourceBundle
bundle )
{
-sink.table();
-
-sink.tableRow();
-
-sinkHeader( sink, bundle.getString( report.changes.label.type ) );
-
-sinkHeader( sink, bundle.getString( report.changes.label.changes ) );
+if( actionList.isEmpty() )
+{
+sink.paragraph();
-sinkHeader( sink, bundle.getString( report.changes.label.by ) );
+sink.text( bundle.getString(report.changes.text.no.changes) );
-if ( this.isAddActionDate() )
-{
-sinkHeader( sink, bundle.getString( report.changes.label.date )
);
+sink.paragraph_();
}
-sink.tableRow_();
-
-for ( int idx = 0; idx actionList.size(); idx++ )
+else
{
-Action action = (Action) actionList.get( idx );
+sink.table();
sink.tableRow();
-sinkShowTypeIcon( sink, action.getType() );
+sinkHeader( sink, bundle.getString( report.changes.label.type )
);
-sink.tableCell();
+sinkHeader( sink, bundle.getString( report.changes.label.changes
) );
-sink.rawText( action.getAction() );
+sinkHeader( sink, bundle.getString( report.changes.label.by ) );
+
+if ( this.isAddActionDate() )
+{
+sinkHeader( sink, bundle.getString(
report.changes.label.date ) );
+}
+sink.tableRow_();
-// no null check needed classes from modello return a new ArrayList
-if ( StringUtils.isNotEmpty( action.getIssue() ) || (
!action.getFixedIssues().isEmpty() ) )
+for ( int idx = 0; idx actionList.size(); idx++ )
{
-sink.text( + bundle.getString( report.changes.text.fixes
) + );
+Action action = (Action) actionList.get( idx );
+
+sink.tableRow();
-String system = action.getSystem();
-system = StringUtils.isEmpty( system ) ?
DEFAULT_ISSUE_SYSTEM_KEY : system;
-if ( !canGenerateIssueLinks( system ) )
+sinkShowTypeIcon( sink, action.getType() );
+
+sink.tableCell();
+
+sink.rawText( action.getAction() );
+
+// no null check needed classes from modello return a new
ArrayList
+if ( StringUtils.isNotEmpty( action.getIssue() ) || (
!action.getFixedIssues().isEmpty() ) )
{
-constructIssueText( action.getIssue(), sink,
action.getFixedIssues() );
+sink.text( + bundle.getString(
report.changes.text.fixes ) + );
+
+String system = action.getSystem();
+system = StringUtils.isEmpty( system ) ?
DEFAULT_ISSUE_SYSTEM_KEY : system;
+if ( !canGenerateIssueLinks( system ) )
+{
+constructIssueText( action.getIssue(), sink,
action.getFixedIssues() );
+}
+else
+{
+constructIssueLink( action.getIssue(), system, sink,
action.getFixedIssues() );
+}
+sink.text( . );
}
-else
+
+if ( StringUtils.isNotEmpty( action.getDueTo() ) || (
!action.getDueTos().isEmpty() ) )
{
-constructIssueLink( action.getIssue(), system, sink,
action.getFixedIssues() );
+constructDueTo( sink, action, bundle, action.getDueTos() );
}
-sink.text( . );
-}
-if (
svn commit: r757781 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl Date: Tue Mar 24 13:16:39 2009 New Revision: 757781 URL: http://svn.apache.org/viewvc?rev=757781view=rev Log: [MCHANGES-157] Update to Doxia 1.0 Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=757781r1=757780r2=757781view=diff == --- maven/plugins/trunk/maven-changes-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Mar 24 13:16:39 2009 @@ -73,8 +73,8 @@ /issueManagement properties -doxiaVersion1.0-alpha-11/doxiaVersion -doxiaSitetoolsVersion1.0-alpha-11/doxiaSitetoolsVersion +doxiaVersion1.0/doxiaVersion +doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion /properties dependencies @@ -250,7 +250,6 @@ /dependency !-- trac dependencies -- - dependency groupIdorg.apache.xmlrpc/groupId artifactIdxmlrpc-client/artifactId
svn commit: r757784 - /maven/plugins/trunk/maven-changes-plugin/
Author: dennisl Date: Tue Mar 24 13:18:57 2009 New Revision: 757784 URL: http://svn.apache.org/viewvc?rev=757784view=rev Log: o Add SVN properties for bugtraq Modified: maven/plugins/trunk/maven-changes-plugin/ (props changed) Propchange: maven/plugins/trunk/maven-changes-plugin/ -- bugtraq:logregex = MCHANGES-\d+ Propchange: maven/plugins/trunk/maven-changes-plugin/ -- bugtraq:url = http://jira.codehaus.org/browse/%BUGID% Propchange: maven/plugins/trunk/maven-changes-plugin/ -- bugtraq:warnifnoissue = false
svn commit: r757802 - /maven/plugins/trunk/maven-changes-plugin/pom.xml
Author: dennisl
Date: Tue Mar 24 13:49:31 2009
New Revision: 757802
URL: http://svn.apache.org/viewvc?rev=757802view=rev
Log:
o Use a property to specify the version of Maven core dependencies.
o Sync the version with the prerequisites.
Modified:
maven/plugins/trunk/maven-changes-plugin/pom.xml
Modified: maven/plugins/trunk/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/pom.xml?rev=757802r1=757801r2=757802view=diff
==
--- maven/plugins/trunk/maven-changes-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-changes-plugin/pom.xml Tue Mar 24 13:49:31 2009
@@ -59,7 +59,7 @@
/contributors
prerequisites
-maven2.0.6/maven
+maven${mavenVersion}/maven
/prerequisites
scm
@@ -75,6 +75,7 @@
properties
doxiaVersion1.0/doxiaVersion
doxiaSitetoolsVersion1.0/doxiaSitetoolsVersion
+mavenVersion2.0.6/mavenVersion
/properties
dependencies
@@ -82,28 +83,30 @@
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-model/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-plugin-api/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-project/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven/groupId
artifactIdmaven-settings/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-api/artifactId
- version2.0.4/version
+ version${mavenVersion}/version
/dependency
+
+!-- shared --
dependency
groupIdorg.apache.maven.reporting/groupId
artifactIdmaven-reporting-impl/artifactId
svn commit: r757806 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/mng-4107/
Author: bentmann
Date: Tue Mar 24 14:01:39 2009
New Revision: 757806
URL: http://svn.apache.org/viewvc?rev=757806view=rev
Log:
[MNG-4107] [regression] User settings can't override properties used for POM
interpolation
o Added IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4107/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4107/pom.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4107/profiles.xml
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4107/settings.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=757806r1=757805r2=757806view=diff
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
Tue Mar 24 14:01:39 2009
@@ -92,6 +92,7 @@
// suite.addTestSuite( MavenIT0109ReleaseUpdateTest.class );
// suite.addTestSuite( MavenIT0108SnapshotUpdateTest.class ); --
MNG-3137
+suite.addTestSuite(
MavenITmng4107InterpolationUsesDominantProfileSourceTest.class );
suite.addTestSuite(
MavenITmng4106InterpolationUsesDominantProfileTest.class );
suite.addTestSuite(
MavenITmng4102InheritedPropertyInterpolationTest.class );
suite.addTestSuite( MavenITmng4091BadPluginDescriptorTest.class );
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java?rev=757806view=auto
==
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
Tue Mar 24 14:01:39 2009
@@ -0,0 +1,79 @@
+package org.apache.maven.it;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.File;
+import java.util.Properties;
+
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * This is a test set for a
href=http://jira.codehaus.org/browse/MNG-4107;MNG-4107/a.
+ *
+ * @author Benjamin Bentmann
+ * @version $Id$
+ */
+public class MavenITmng4107InterpolationUsesDominantProfileSourceTest
+extends AbstractMavenIntegrationTestCase
+{
+
+public MavenITmng4107InterpolationUsesDominantProfileSourceTest()
+{
+super( [2.0.5,) );
+}
+
+/**
+ * Test that POM interpolation uses the property values from the dominant
profile source (POM vs. profiles.xml
+ * vs. settings.xml). This boils down to the proper order of profile
injection and interpolation, i.e.
+ * interpolate after profiles from all sources are injected.
+ */
+public void testitMNG4107()
+throws Exception
+{
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng-4107 );
+
+Verifier verifier = new Verifier( testDir.getAbsolutePath() );
+verifier.setAutoclean( false );
+verifier.getCliOptions().add( --settings );
+verifier.getCliOptions().add(
svn commit: r757879 - /maven/components/trunk/maven-model/src/main/mdo/maven.mdo
Author: bentmann
Date: Tue Mar 24 16:15:42 2009
New Revision: 757879
URL: http://svn.apache.org/viewvc?rev=757879view=rev
Log:
o Added toString() for Model to ease debugging
Modified:
maven/components/trunk/maven-model/src/main/mdo/maven.mdo
Modified: maven/components/trunk/maven-model/src/main/mdo/maven.mdo
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model/src/main/mdo/maven.mdo?rev=757879r1=757878r2=757879view=diff
==
--- maven/components/trunk/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/trunk/maven-model/src/main/mdo/maven.mdo Tue Mar 24
16:15:42 2009
@@ -583,6 +583,12 @@
return id.toString();
}
+
+@Override
+public String toString()
+{
+return getId();
+}
]]
/code
/codeSegment
svn commit: r757900 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Author: bentmann
Date: Tue Mar 24 16:48:29 2009
New Revision: 757900
URL: http://svn.apache.org/viewvc?rev=757900view=rev
Log:
o Marked potential performance problem
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=757900r1=757899r2=757900view=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 Mar 24 16:48:29 2009
@@ -334,6 +334,10 @@
{
if ( parent == null )
{
+/*
+ * TODO: This is suboptimal. Without a cache in the project
builder, rebuilding the parent chain currently
+ * causes O(n^2) parser invocations for an inheritance hierarchy
of depth n.
+ */
if ( parentFile != null )
{
try
svn commit: r757922 - in /maven/components/branches/MNG-2766/maven-core/src: main/java/org/apache/maven/lifecycle/ main/java/org/apache/maven/plugin/ test/java/org/apache/maven/lifecycle/
Author: jvanzyl
Date: Tue Mar 24 17:45:00 2009
New Revision: 757922
URL: http://svn.apache.org/viewvc?rev=757922view=rev
Log:
o i can now in a simple way get the lifecycle plan for a particular task
o the tests need to be simplified, possibly use the jxpath technique to make
the test more concise
o the API still needs some work, and we still need to be able to adapt the
lifecycle in context -- my particular use case is running inside eclipse and
essentially disabling all but what is required to run inside eclipse. we don't
need to compile, test or package for example
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=757922r1=757921r2=757922view=diff
==
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Tue Mar 24 17:45:00 2009
@@ -187,15 +187,54 @@
// if NEVER, don't blacklist
return false;
}
+
+private void executeGoal( String task, MavenSession session, MavenProject
project )
+throws LifecycleExecutionException, BuildFailureException
+{
+ListMojoDescriptor lifecyclePlan = calculateLifecyclePlan( task,
session );
+
+for( MojoDescriptor md : lifecyclePlan )
+{
+System.out.println( md.getFullGoalName() );
+}
+
+/*
+for ( MojoExecution mojoExecution : goals )
+ {
+ MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
+
+ try
+ {
+ pluginManager.executeMojo( project, mojoExecution, session );
+ }
+ catch ( PluginManagerException e )
+ {
+ throw new LifecycleExecutionException( Internal error in the
plugin manager executing goal ' + mojoDescriptor.getId() + ': +
e.getMessage(), e );
+ }
+ catch ( MojoFailureException e )
+ {
+ throw new BuildFailureException( e.getMessage(), e );
+ }
+ catch ( PluginConfigurationException e )
+ {
+ throw new LifecycleExecutionException( e.getMessage(), e );
+ }
+ }
+ */
+
+}
// 1. Find the lifecycle given the phase (default lifecycle when given
install)
// 2. Find the lifecycle mapping that corresponds to the project packaging
(jar lifecycle mapping given the jar packaging)
// 3. Find the mojos associated with the lifecycle given the project
packaging (jar lifecycle mapping for the default lifecycle)
// 4. Bind those mojos found in the lifecycle mapping for the packaging to
the lifecycle
// 5. Bind mojos specified in the project itself to the lifecycle
-private void executeGoal( String task, MavenSession session, MavenProject
project )
-throws LifecycleExecutionException, BuildFailureException
+public ListMojoDescriptor calculateLifecyclePlan( String task,
MavenSession session )
+throws LifecycleExecutionException
{
+// Extract the project from the session
+MavenProject project = session.getCurrentProject();
+
// 1.
Lifecycle lifecycle = phaseToLifecycleMap.get( task );
@@ -262,39 +301,23 @@
}
}
}
-
+
+ListMojoDescriptor lifecyclePlan = new ArrayListMojoDescriptor();
+
// We need to turn this into a set of MojoExecutions
for( ListString mojos : phaseToMojoMapping.values() )
{
for( String mojo : mojos )
{
-System.out.println( + mojo );
+// These are bits that look like this:
+//
+//
org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process
+//
+lifecyclePlan.add( getMojoDescriptor( mojo, session, project )
);
}
-}
+}
-/*
- for ( MojoExecution mojoExecution :
svn commit: r757927 - in /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java processor/ProcessorContext.java
Author: bentmann
Date: Tue Mar 24 18:02:05 2009
New Revision: 757927
URL: http://svn.apache.org/viewvc?rev=757927view=rev
Log:
o Added missing processors
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=757927r1=757926r2=757927view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Mar 24 18:02:05 2009
@@ -337,20 +337,11 @@
try
{
-// TODO: Review why this blows up the tests when we inject all the
profiles in one go
-for ( IteratorProfile it = projectProfiles.iterator();
it.hasNext(); )
-{
-Profile profile = it.next();
-PomClassicDomainModel dm =
-ProcessorContext.mergeProfilesIntoModel( Arrays.asList(
profile ), model, false );
-if ( !it.hasNext() )
-{
-ProcessorContext.interpolateModelProperties(
dm.getModelProperties(),
- new
ArrayListInterpolatorProperty(), dm );
-dm = new PomClassicDomainModel( dm.getModelProperties(),
false );
-}
-model = dm.getModel();
-}
+PomClassicDomainModel dm =
ProcessorContext.mergeProfilesIntoModel( projectProfiles, model, false );
+ProcessorContext.interpolateModelProperties(
dm.getModelProperties(),
+ new
ArrayListInterpolatorProperty(), dm );
+dm = new PomClassicDomainModel( dm.getModelProperties(), false );
+model = dm.getModel();
}
catch ( IOException e )
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java?rev=757927r1=757926r2=757927view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
Tue Mar 24 18:02:05 2009
@@ -82,11 +82,14 @@
Collections.reverse( profileModels );
profileModels.add( 0, model );
ListProcessor processors =
-Arrays.asList( (Processor) new BuildProcessor( new
ArrayListProcessor() ),
- (Processor) new ProfilesModuleProcessor(), new
ProfilePropertiesProcessor(), new ParentProcessor(),
- new OrganizationProcessor(), new
MailingListProcessor(), new IssueManagementProcessor(),
- new CiManagementProcessor(), new
ReportingProcessor(), new RepositoriesProcessor(),
- new DistributionManagementProcessor());
+Arrays.Processor asList( new BuildProcessor( new
ArrayListProcessor() ), new ProfilesModuleProcessor(),
+ new ProfilePropertiesProcessor(), new
ParentProcessor(),
+ new OrganizationProcessor(), new
MailingListProcessor(),
+ new IssueManagementProcessor(), new
CiManagementProcessor(),
+ new ReportingProcessor(), new
RepositoriesProcessor(),
+ new DistributionManagementProcessor(),
new LicensesProcessor(),
+ new ScmProcessor(), new
PrerequisitesProcessor(), new ContributorsProcessor(),
+ new DevelopersProcessor() );
Model target = processModelsForInheritance(profileModels, processors,
false);
svn commit: r757932 - /maven/pom/trunk/maven/pom.xml
Author: aheritier Date: Tue Mar 24 18:20:07 2009 New Revision: 757932 URL: http://svn.apache.org/viewvc?rev=757932view=rev Log: will change soon... Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=757932r1=757931r2=757932view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Tue Mar 24 18:20:07 2009 @@ -55,8 +55,6 @@ idaheritier/id nameArnaud Héritier/name emailaherit...@apache.org/email - organizationOCTO Technology/organization - organizationUrlhttp://www.octo.com/organizationUrl roles rolePMC Member/role /roles
svn commit: r757936 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/processor/ test/java/org/apache/maven/project/ test/java/org/apache/maven/project/processor/
Author: sisbell
Date: Tue Mar 24 18:24:56 2009
New Revision: 757936
URL: http://svn.apache.org/viewvc?rev=757936view=rev
Log:
[MNG-3906] - Project-level plugin dependencies order. Fixed a lot of problems
with ordering of elements. We need to assume that the processors always get the
parent model first, then the child, down the line.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependenciesProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ReportingProcessor.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/DependenciesProcessorTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/DependencyProcessorTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java?rev=757936r1=757935r2=757936view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
Tue Mar 24 18:24:56 2009
@@ -20,12 +20,8 @@
*/
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
import org.apache.maven.model.Build;
import org.apache.maven.model.BuildBase;
@@ -60,20 +56,26 @@
if(build == null !( p == null || p.getBuild() == null))
{
copy(p.getBuild(), t.getBuild(), isProfile);
+copyResources(p.getBuild(), t.getBuild());
pluginsProcessor.process( p.getBuild().getPlugins(), null,
t.getBuild().getPlugins(), isChildMostSpecialized );
inheritManagement(p.getBuild().getPluginManagement(), null,
t.getBuild());
}
else if(build != null !( p == null || p.getBuild() == null))
{
-copy(build, t.getBuild(), isProfile);
+
copy(p.getBuild(), t.getBuild(), isProfile);
-
+copy(build, t.getBuild(), isProfile);
+
+copyResources(build, t.getBuild());
+copyResources(p.getBuild(), t.getBuild());
+
pluginsProcessor.process( p.getBuild().getPlugins(),
build.getPlugins(), t.getBuild().getPlugins(), isChildMostSpecialized );
inheritManagement(p.getBuild().getPluginManagement(),
build.getPluginManagement(), t.getBuild());
}
else if(build != null )
{
copy(build, t.getBuild(), isProfile);
+copyResources(build, t.getBuild());
pluginsProcessor.process( null, build.getPlugins(),
t.getBuild().getPlugins(), isChildMostSpecialized );
inheritManagement(null, build.getPluginManagement(), t.getBuild());
}
@@ -102,42 +104,11 @@
target.setPluginManagement( new PluginManagement() );
}
proc.process( p, c, target.getPluginManagement().getPlugins(),
false );
-}
-
+}
}
-
-private static void copy(BuildBase source, Build target, boolean
isProfile)
+
+private static void copyResources(BuildBase source, Build target)
{
-if(target.getFinalName() == null)
-{
-target.setFinalName( source.getFinalName() );
-}
-
-if(target.getDefaultGoal() == null)
-{
-target.setDefaultGoal( source.getDefaultGoal() );
-}
-
-if(target.getDirectory() == null)
-{
-target.setDirectory( source.getDirectory() );
-}
-
-ListString filters = new ArrayListString(target.getFilters());
-for(String filter : source.getFilters())
-{
-
svn commit: r757965 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/ main/java/org/apache/maven/project/processor/ test/java/org/apache/maven/project/
Author: sisbell
Date: Tue Mar 24 19:14:42 2009
New Revision: 757965
URL: http://svn.apache.org/viewvc?rev=757965view=rev
Log:
Fixed some problems with inheritance of resources.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=757965r1=757964r2=757965view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Mar 24 19:14:42 2009
@@ -145,18 +145,7 @@
setBuildOutputDirectoryOnParent( project );
hm.put( ArtifactUtils.artifactId( project.getGroupId(),
project.getArtifactId(), pom, project.getVersion() ), project );
-try
-{
-if(maven-project-builder.equals(
project.getModel().getArtifactId())){
-System.out.println(convertToDomainModel(project.getModel(),
true).asString());
-}
-
-}
-catch ( IOException e )
-{
-// TODO Auto-generated catch block
-e.printStackTrace();
-}
+
return project;
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java?rev=757965r1=757964r2=757965view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/BuildProcessor.java
Tue Mar 24 19:14:42 2009
@@ -65,10 +65,11 @@
copy(p.getBuild(), t.getBuild(), isProfile);
copy(build, t.getBuild(), isProfile);
-
-copyResources(build, t.getBuild());
-copyResources(p.getBuild(), t.getBuild());
+copyResources(build, t.getBuild());
+copyResources(p.getBuild(), t.getBuild());
+
+
pluginsProcessor.process( p.getBuild().getPlugins(),
build.getPlugins(), t.getBuild().getPlugins(), isChildMostSpecialized );
inheritManagement(p.getBuild().getPluginManagement(),
build.getPluginManagement(), t.getBuild());
}
@@ -109,35 +110,7 @@
private static void copyResources(BuildBase source, Build target)
{
-if(target.getResources().isEmpty())
-{
-for(Resource resource : source.getResources())
-{
-Resource r = new Resource();
-r.setDirectory( resource.getDirectory());
-r.setFiltering( resource.isFiltering() );
-r.setMergeId( resource.getMergeId() );
-r.setTargetPath( resource.getTargetPath() );
-r.setExcludes( new ArrayListString(resource.getExcludes()) );
-r.setIncludes( new ArrayListString(resource.getIncludes()) );
-target.getResources().add( r );
-}
-}
-
-if(target.getTestResources().isEmpty())
-{
-for(Resource resource : source.getTestResources())
-{
-Resource r = new Resource();
-r.setDirectory( resource.getDirectory());
-r.setFiltering( resource.isFiltering() );
-r.setMergeId( resource.getMergeId() );
-r.setTargetPath( resource.getTargetPath() );
-r.setExcludes( new ArrayListString(resource.getExcludes()) );
-r.setIncludes( new ArrayListString(resource.getIncludes()) );
-target.getTestResources().add( r );
-}
-}
+
ListString filters = new ArrayListString(target.getFilters());
for(String filter : source.getFilters())
@@ -170,8 +143,41 @@
if(source.getDirectory() != null)
{
target.setDirectory( source.getDirectory() );
-}
-
+}
+
+if(!source.getResources().isEmpty())
+{
+ListResource resources = new ArrayListResource();
+
svn commit: r757967 - /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Author: bentmann
Date: Tue Mar 24 19:21:44 2009
New Revision: 757967
URL: http://svn.apache.org/viewvc?rev=757967view=rev
Log:
o Used the same code path for testing as a real build would use
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=757967r1=757966r2=757967view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Tue Mar 24 19:21:44 2009
@@ -1236,7 +1236,7 @@
}
private PomTestWrapper buildPomFromMavenProject( String pomPath, String...
profileIds )
-throws IOException
+throws Exception
{
File pomFile = new File( testDirectory , pomPath );
if ( pomFile.isDirectory() )
@@ -1252,8 +1252,7 @@
}
config.setGlobalProfileManager(new
DefaultProfileManager(this.getContainer(), pCtx));
-return new PomTestWrapper( pomFile,
mavenProjectBuilder.buildFromLocalPath( pomFile, null, null, null,
-config, mavenProjectBuilder ) );
+return new PomTestWrapper( pomFile, mavenProjectBuilder.build(
pomFile, config ) );
}
private Model buildMixin( String mixinPath )
svn commit: r757977 - in /maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype: common/DefaultArchetypeArtifactManager.java repositorycrawler/DefaultRepositoryCrawler.java
Author: rafale
Date: Tue Mar 24 19:38:22 2009
New Revision: 757977
URL: http://svn.apache.org/viewvc?rev=757977view=rev
Log:
Fix for archetype-234. Thanks for the contribution of Jason Voegele
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/repositorycrawler/DefaultRepositoryCrawler.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java?rev=757977r1=757976r2=757977view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/common/DefaultArchetypeArtifactManager.java
Tue Mar 24 19:38:22 2009
@@ -74,7 +74,7 @@
* @plexus.requirement
*/
private RepositoryMetadataManager repositoryMetadataManager;
-
+
private Map archetypeCache = new TreeMap();
public File getArchetypeFile (
@@ -95,7 +95,7 @@
version);
if (archetype==null)
{
-archetype =
+archetype =
downloader.download (
groupId,
artifactId,
@@ -143,35 +143,43 @@
throws XmlPullParserException, UnknownArchetype, IOException
{
String pomFileName = null;
-ZipFile zipFile = getArchetypeZipFile ( jar );
-Enumeration enumeration = zipFile.entries ();
-while ( enumeration.hasMoreElements () )
+ZipFile zipFile = null;
+try
{
-ZipEntry el = (ZipEntry) enumeration.nextElement ();
-
-String entry = el.getName ();
-if ( entry.startsWith ( META-INF ) entry.endsWith ( pom.xml
) )
+zipFile = getArchetypeZipFile ( jar );
+Enumeration enumeration = zipFile.entries ();
+while ( enumeration.hasMoreElements () )
{
-pomFileName = entry;
+ZipEntry el = (ZipEntry) enumeration.nextElement ();
+
+String entry = el.getName ();
+if ( entry.startsWith ( META-INF ) entry.endsWith (
pom.xml ) )
+{
+pomFileName = entry;
+}
}
-}
-if ( pomFileName == null )
-{
-return null;
-}
+if ( pomFileName == null )
+{
+return null;
+}
-ZipEntry pom =
-zipFile.getEntry ( StringUtils.replace ( pomFileName,
File.separator, / ) );
-if ( pom == null )
-{
-pom = zipFile.getEntry ( StringUtils.replace ( pomFileName, /,
File.separator ) );
+ZipEntry pom =
+zipFile.getEntry ( StringUtils.replace ( pomFileName,
File.separator, / ) );
+if ( pom == null )
+{
+pom = zipFile.getEntry ( StringUtils.replace ( pomFileName,
/, File.separator ) );
+}
+if ( pom == null )
+{
+return null;
+}
+return pomManager.readPom ( zipFile.getInputStream ( pom ) );
}
-if ( pom == null )
+finally
{
-return null;
+closeZipFile( zipFile );
}
-return pomManager.readPom ( zipFile.getInputStream ( pom ) );
}
public ZipFile getArchetypeZipFile ( File archetypeFile )
@@ -193,9 +201,10 @@
public boolean isFileSetArchetype ( File archetypeFile )
{
+ZipFile zipFile = null;
try
{
-ZipFile zipFile = getArchetypeZipFile ( archetypeFile );
+zipFile = getArchetypeZipFile ( archetypeFile );
return isFileSetArchetype ( zipFile );
}
@@ -211,6 +220,10 @@
{
return false;
}
+finally
+{
+closeZipFile( zipFile );
+}
}
public boolean isFileSetArchetype (
@@ -222,9 +235,10 @@
List repositories
)
{
+ZipFile zipFile = null;
try
{
-ZipFile zipFile =
+zipFile =
getArchetypeZipFile (
getArchetypeFile (
groupId,
@@ -250,13 +264,18 @@
{
return false;
}
+finally
+{
+closeZipFile( zipFile );
+}
}
public boolean isOldArchetype ( File archetypeFile )
{
+ZipFile zipFile = null;
svn commit: r757982 - in /maven/components/trunk/maven-project/src/test/resources-project-builder: dependencies-with-different-versions/pom.xml execution-configuration-subcollections/pom.xml multiple-
Author: bentmann Date: Tue Mar 24 19:45:06 2009 New Revision: 757982 URL: http://svn.apache.org/viewvc?rev=757982view=rev Log: o Made the models valid Modified: maven/components/trunk/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml maven/components/trunk/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml maven/components/trunk/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml Modified: maven/components/trunk/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml?rev=757982r1=757981r2=757982view=diff == --- maven/components/trunk/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml (original) +++ maven/components/trunk/maven-project/src/test/resources-project-builder/dependencies-with-different-versions/pom.xml Tue Mar 24 19:45:06 2009 @@ -3,6 +3,7 @@ modelVersion4.0.0/modelVersion groupIda/groupId artifactIdb/artifactId +version1.0/version dependencies dependency groupIdcommons-collections/groupId Modified: maven/components/trunk/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml?rev=757982r1=757981r2=757982view=diff == --- maven/components/trunk/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml (original) +++ maven/components/trunk/maven-project/src/test/resources-project-builder/execution-configuration-subcollections/pom.xml Tue Mar 24 19:45:06 2009 @@ -1,6 +1,7 @@ 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 +groupIdtest/groupId artifactIdnexus/artifactId packagingpom/packaging nameNexus Repository Manager/name Modified: maven/components/trunk/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml?rev=757982r1=757981r2=757982view=diff == --- maven/components/trunk/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml (original) +++ maven/components/trunk/maven-project/src/test/resources-project-builder/multiple-filters/pom.xml Tue Mar 24 19:45:06 2009 @@ -3,6 +3,7 @@ modelVersion4.0.0/modelVersion groupIda/groupId artifactIdb/artifactId + version1.0/version build filters Modified: maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml?rev=757982r1=757981r2=757982view=diff == --- maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml (original) +++ maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-config-properties/pom.xml Tue Mar 24 19:45:06 2009 @@ -3,6 +3,7 @@ modelVersion4.0.0/modelVersion groupIda/groupId artifactIdb/artifactId +version1.0/version build plugins plugin
svn commit: r757983 - in /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project: PomConstructionTest.java harness/PomTestWrapper.java
Author: bentmann
Date: Tue Mar 24 19:47:02 2009
New Revision: 757983
URL: http://svn.apache.org/viewvc?rev=757983view=rev
Log:
o Used the same code path for testing as a real build would use to reduce
discrepancies between ITs and UTs
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=757983r1=757982r2=757983view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Tue Mar 24 19:47:02 2009
@@ -68,7 +68,7 @@
public void testEmptyUrl()
throws Exception
{
-buildPomFromMavenProject( empty-distMng-repo-url, null );
+buildPom( empty-distMng-repo-url, null );
}
/**
@@ -80,7 +80,7 @@
public void testProfileModules()
throws Exception
{
-PomTestWrapper pom = buildPomFromMavenProject( profile-module, a );
+PomTestWrapper pom = buildPom( profile-module, a );
assertEquals( test-prop, pom.getValue( properties[1]/b ) );//
verifies profile applied
assertEquals( 4, ( (List?) pom.getValue( modules ) ).size() );
assertEquals( module-2, pom.getValue( modules[1] ) );
@@ -120,7 +120,7 @@
public void testProfilePropertiesInterpolation()
throws Exception
{
- PomTestWrapper pom = buildPomFromMavenProject(
profile-properties-interpolation, interpolation-profile );
+ PomTestWrapper pom = buildPom( profile-properties-interpolation,
interpolation-profile );
assertEquals(PASSED, pom.getValue(properties[1]/test));
assertEquals(PASSED, pom.getValue(properties[1]/property));
}
@@ -187,7 +187,7 @@
public void testParentInterpolation()
throws Exception
{
-PomTestWrapper pom = buildPomFromMavenProject(
parent-interpolation/sub, null );
+PomTestWrapper pom = buildPom( parent-interpolation/sub, null );
pom = new PomTestWrapper(pom.getMavenProject().getParent());
assertEquals( 1.3.0-SNAPSHOT, pom.getValue(
build/plugins[1]/version ) );
}
@@ -217,7 +217,7 @@
public void testPluginManagementDependencies()
throws Exception
{
-PomTestWrapper pom = buildPomFromMavenProject(
plugin-management-dependencies/sub, test );
+PomTestWrapper pom = buildPom( plugin-management-dependencies/sub,
test );
assertEquals( 1.0-alpha-21, pom.getValue( build/plugins[1]/version
) );
assertEquals( 1.0, pom.getValue(
build/plugins[1]/dependencies[1]/version ) );
}
@@ -227,7 +227,7 @@
public void testReportingInterpolation()
throws Exception
{
-PomTestWrapper pom = buildPomFromMavenProject(
reporting-interpolation, null );
+PomTestWrapper pom = buildPom( reporting-interpolation, null );
pom = new PomTestWrapper(pom.getMavenProject());
assertEquals( createPath(Arrays.asList(System.getProperty(user.dir),
src, test, resources-project-builder,
reporting-interpolation, target, site)),
@@ -493,7 +493,7 @@
}
-/* FIXME: cf. MNG-3906*/
+/* MNG-3906*/
public void testOrderOfMergedPluginDependenciesWithoutPluginManagement()
throws Exception
{
@@ -512,7 +512,6 @@
assertEquals( d, pom.getValue(
build/plugins[1]/dependencies[5]/artifactId ) );
assertEquals( 1, pom.getValue(
build/plugins[1]/dependencies[5]/version ) );
}
-//*/
public void testOrderOfMergedPluginDependenciesWithPluginManagement()
throws Exception
@@ -561,7 +560,7 @@
assertEquals( http://parent.url/download;, pom.getValue(
distributionManagement/downloadUrl ) );
}
-/* FIXME: MNG-3846*/
+/* MNG-3846*/
public void testAppendArtifactIdOfParentAndChildToInheritedUrls()
throws Exception
{
@@ -623,7 +622,7 @@
assertEquals( PASSED, pom.getValue( properties/property +
index ) );
}
}
-/* FIXME*/
+
public void
testInterpolationOfLegacyExpressionsThatDontIncludeTheProjectPrefix()
throws Exception
{
@@ -657,7 +656,7 @@
assertTrue( pom.getValue( properties/projectBuildOut
).toString().endsWith( bin ) );
assertTrue( pom.getValue( properties/projectSiteOut
).toString().endsWith( doc ) );
}
-//*/
+
public void testInterpolationWithBasedirAlignedDirectories()
throws Exception
{
@@ -762,7 +761,7 @@
svn commit: r757987 - in /maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype: mojos/CreateProjectFromArchetypeMojo.java ui/DefaultArchetypeSelector.java
Author: rafale
Date: Tue Mar 24 19:59:51 2009
New Revision: 757987
URL: http://svn.apache.org/viewvc?rev=757987view=rev
Log:
Using remote catalog preferably, but defaulting to internal when remote don't
exists (remote = http://repo1.maven.org/maven2/archetype-catalog.xml)
Modified:
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
Modified:
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java?rev=757987r1=757986r2=757987view=diff
==
---
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
(original)
+++
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateProjectFromArchetypeMojo.java
Tue Mar 24 19:59:51 2009
@@ -131,7 +131,7 @@
* @required
*/
private List remoteArtifactRepositories;
-
+
/**
* User settings use to check the interactiveMode.
*
@@ -143,8 +143,8 @@
/** @parameter expression=${basedir} */
private File basedir;
-/**
- * @parameter expression=${session}
+/**
+ * @parameter expression=${session}
* @readonly
*/
private MavenSession session;
@@ -157,9 +157,9 @@
public void execute()
throws MojoExecutionException, MojoFailureException
-{
+{
Properties executionProperties = session.getExecutionProperties();
-
+
ArchetypeGenerationRequest request = new ArchetypeGenerationRequest()
.setArchetypeGroupId( archetypeGroupId )
.setArchetypeArtifactId( archetypeArtifactId )
@@ -179,7 +179,7 @@
{
getLog().info( Generating project in Batch mode );
}
-
+
selector.selectArchetype( request, interactiveMode,
archetypeCatalog );
configurator.configureArchetype( request, interactiveMode,
executionProperties );
Modified:
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java?rev=757987r1=757986r2=757987view=diff
==
---
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
(original)
+++
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeSelector.java
Tue Mar 24 19:59:51 2009
@@ -54,7 +54,7 @@
/** @plexus.requirement */
private org.apache.maven.archetype.Archetype archetype;
-public void selectArchetype( ArchetypeGenerationRequest request,
+public void selectArchetype( ArchetypeGenerationRequest request,
Boolean interactiveMode, String catalogs )
throws
ArchetypeNotDefined,
@@ -62,7 +62,7 @@
UnknownGroup,
IOException,
PrompterException,
-ArchetypeSelectionFailure
+ArchetypeSelectionFailure
{
//This should be an internal class
ArchetypeDefinition definition = new ArchetypeDefinition();
@@ -70,7 +70,7 @@
definition.setGroupId( request.getArchetypeGroupId() );
definition.setArtifactId( request.getArchetypeArtifactId() );
definition.setVersion( request.getArchetypeVersion() );
-
+
Map archetypes = getArchetypesByCatalog ( catalogs );
if ( definition.isDefined ()
@@ -109,7 +109,7 @@
else if ( keySplitted.length 1 )
{
int lastIndex = catalogKey.lastIndexOf(/);
-String catalogBase = catalogKey.substring(0,
+String catalogBase = catalogKey.substring(0,
(lastIndex 7 ? lastIndex :
catalogKey.length()));
definition.setRepository ( catalogBase );
}
@@ -124,7 +124,7 @@
{
getLogger ().warn ( No archetype repository found.
Falling back to central repository (http://repo1.maven.org/maven2). );
getLogger ().warn ( Use -DarchetypeRepository=your
repository if archetype's repository is elsewhere. );
-
+
definition.setRepository(http://repo1.maven.org/maven2;);
svn commit: r757998 - /maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml
Author: rafale Date: Tue Mar 24 20:21:15 2009 New Revision: 757998 URL: http://svn.apache.org/viewvc?rev=757998view=rev Log: Catalog created from MAVENUSER Modified: maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml Modified: maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml?rev=757998r1=757997r2=757998view=diff == --- maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml (original) +++ maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml Tue Mar 24 20:21:15 2009 @@ -110,36 +110,6 @@ descriptionA simple Java web application/description /archetype archetype - groupIdorg.apache.camel.archetypes/groupId - artifactIdcamel-archetype-component/artifactId - versionRELEASE/version - descriptionCreates a new Camel component/description -/archetype -archetype - groupIdorg.apache.camel.archetypes/groupId - artifactIdcamel-archetype-activemq/artifactId - versionRELEASE/version - descriptionCreates a new Camel project that configures and interacts with ActiveMQ/description -/archetype -archetype - groupIdorg.apache.camel.archetypes/groupId - artifactIdcamel-archetype-java/artifactId - versionRELEASE/version - descriptionCreates a new Camel project using Java DSL/description -/archetype -archetype - groupIdorg.apache.camel.archetypes/groupId - artifactIdcamel-archetype-scala/artifactId - versionRELEASE/version - descriptionCreates a new Camel project using Scala DSL/description -/archetype -archetype - groupIdorg.apache.camel.archetypes/groupId - artifactIdcamel-archetype-spring/artifactId - versionRELEASE/version - descriptionCreates a new Camel project with added Spring DSL support/description -/archetype -archetype groupIdorg.jini.maven-jini-plugin/groupId artifactIdjini-service-archetype/artifactId version2.0/version @@ -187,13 +157,6 @@ descriptionAtlassian Confluence plugin archetype/description /archetype archetype - groupIdcom.atlassian.maven.archetypes/groupId - artifactIdjira-plugin-archetype/artifactId - version5/version - repositoryhttps://maven.atlassian.com/public/repository - descriptionAtlassian JIRA plugin archetype/description -/archetype -archetype groupIdnet.sf.maven-har/groupId artifactIdmaven-archetype-har/artifactId version0.9/version @@ -277,14 +240,20 @@ archetype groupIdorg.codehaus.groovy.maven.archetypes/groupId artifactIdgmaven-archetype-basic/artifactId - version1.0-rc-3/version + versionRELEASE/version descriptionGroovy basic archetype/description /archetype archetype groupIdorg.codehaus.groovy.maven.archetypes/groupId artifactIdgmaven-archetype-mojo/artifactId - version1.0-rc-3/version + versionRELEASE/version descriptionGroovy mojo archetype/description -/archetype +/archetype +archetype + groupIdorg.apache.struts/groupId + artifactIdstruts2-archetype-starter/artifactId + versionRELEASE/version + descriptionStruts 2 Starter Archetype/description +/archetype /archetypes -/archetype-catalog \ No newline at end of file +/archetype-catalog
svn commit: r758036 - in /maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source: CatalogArchetypeDataSinkTest.java WikiArchetypeDataSourceTest.java
Author: rafale Date: Tue Mar 24 21:24:31 2009 New Revision: 758036 URL: http://svn.apache.org/viewvc?rev=758036view=rev Log: updated test to the new catalog list Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java?rev=758036r1=758035r2=758036view=diff == --- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java (original) +++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java Tue Mar 24 21:24:31 2009 @@ -86,6 +86,6 @@ int catalogSize = catalog.getArchetypes().size(); -assertEquals( 46, catalogSize ); +assertEquals( 41, catalogSize ); } } Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java?rev=758036r1=758035r2=758036view=diff == --- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java (original) +++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java Tue Mar 24 21:24:31 2009 @@ -17,11 +17,11 @@ ArchetypeDataSource ads = new InternalCatalogArchetypeDataSource(); List archetypes = ads.getArchetypeCatalog( p ).getArchetypes(); -assertEquals( 46, archetypes.size() ); +assertEquals( 41, archetypes.size() ); Archetype a = (Archetype) lookup(Archetype.class.getName()); archetypes=a.getInternalCatalog().getArchetypes(); -assertEquals( 46, archetypes.size() ); +assertEquals( 41, archetypes.size() ); } }
svn commit: r758045 - in /maven/archetype/trunk/archetype-common/src: main/resources/ test/java/org/apache/maven/archetype/source/
Author: rafale Date: Tue Mar 24 22:04:37 2009 New Revision: 758045 URL: http://svn.apache.org/viewvc?rev=758045view=rev Log: Restored camel archetypes Modified: maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java Modified: maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml?rev=758045r1=758044r2=758045view=diff == --- maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml (original) +++ maven/archetype/trunk/archetype-common/src/main/resources/archetype-catalog.xml Tue Mar 24 22:04:37 2009 @@ -110,6 +110,36 @@ descriptionA simple Java web application/description /archetype archetype + groupIdorg.apache.camel.archetypes/groupId + artifactIdcamel-archetype-component/artifactId + versionRELEASE/version + descriptionCreates a new Camel component/description +/archetype +archetype + groupIdorg.apache.camel.archetypes/groupId + artifactIdcamel-archetype-activemq/artifactId + versionRELEASE/version + descriptionCreates a new Camel project that configures and interacts with ActiveMQ/description +/archetype +archetype + groupIdorg.apache.camel.archetypes/groupId + artifactIdcamel-archetype-java/artifactId + versionRELEASE/version + descriptionCreates a new Camel project using Java DSL/description +/archetype +archetype + groupIdorg.apache.camel.archetypes/groupId + artifactIdcamel-archetype-scala/artifactId + versionRELEASE/version + descriptionCreates a new Camel project using Scala DSL/description +/archetype +archetype + groupIdorg.apache.camel.archetypes/groupId + artifactIdcamel-archetype-spring/artifactId + versionRELEASE/version + descriptionCreates a new Camel project with added Spring DSL support/description +/archetype +archetype groupIdorg.jini.maven-jini-plugin/groupId artifactIdjini-service-archetype/artifactId version2.0/version Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java?rev=758045r1=758044r2=758045view=diff == --- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java (original) +++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/CatalogArchetypeDataSinkTest.java Tue Mar 24 22:04:37 2009 @@ -86,6 +86,6 @@ int catalogSize = catalog.getArchetypes().size(); -assertEquals( 41, catalogSize ); +assertEquals( 46, catalogSize ); } } Modified: maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java?rev=758045r1=758044r2=758045view=diff == --- maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java (original) +++ maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/source/WikiArchetypeDataSourceTest.java Tue Mar 24 22:04:37 2009 @@ -17,11 +17,11 @@ ArchetypeDataSource ads = new InternalCatalogArchetypeDataSource(); List archetypes = ads.getArchetypeCatalog( p ).getArchetypes(); -assertEquals( 41, archetypes.size() ); +assertEquals( 46, archetypes.size() ); Archetype a = (Archetype) lookup(Archetype.class.getName()); archetypes=a.getInternalCatalog().getArchetypes(); -assertEquals( 41, archetypes.size() ); +assertEquals( 46, archetypes.size() ); } }
svn commit: r758121 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/ main/java/org/apache/maven/project/processor/ test/java/org/apache/maven/project/
Author: sisbell
Date: Wed Mar 25 01:39:38 2009
New Revision: 758121
URL: http://svn.apache.org/viewvc?rev=758121view=rev
Log:
[MNG-2591 - Plugin config inheritance.
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/PluginsManagementProcessor.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=758121r1=758120r2=758121view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Wed Mar 25 01:39:38 2009
@@ -257,20 +257,7 @@
{
request.setRemoteRepostories( new ArrayListArtifactRepository()
);
}
-/*
-if(project.getRemoteArtifactRepositories() == null)
-{
-try
-{
-System.out.println(convertToDomainModel(project.getModel(),
true).asString());
-}
-catch ( IOException e )
-{
-// TODO Auto-generated catch block
-e.printStackTrace();
-}
-}
-*/
+
ArtifactResolutionResult result = repositorySystem.resolve( request );
if ( result.hasExceptions() )
@@ -323,19 +310,21 @@
throw new ProjectBuildingException( projectId, Failed to
activate external profiles., projectDescriptor, e );
}
}
-
-try
-{
-PomClassicDomainModel dm =
ProcessorContext.mergeProfilesIntoModel( projectProfiles, model, false );
-ProcessorContext.interpolateModelProperties(
dm.getModelProperties(),
- new
ArrayListInterpolatorProperty(), dm );
-dm = new PomClassicDomainModel( dm.getModelProperties(), false );
-model = dm.getModel();
-}
-catch ( IOException e )
+if(!projectProfiles.isEmpty())
{
+try
+{
+PomClassicDomainModel dm =
ProcessorContext.mergeProfilesIntoModel( projectProfiles, model, false );
+ProcessorContext.interpolateModelProperties(
dm.getModelProperties(),
+ new
ArrayListInterpolatorProperty(), dm );
+dm = new PomClassicDomainModel( dm.getModelProperties(), false
);
+model = dm.getModel();
+}
+catch ( IOException e )
+{
-throw new ProjectBuildingException(projectId, ,
projectDescriptor, e);
+throw new ProjectBuildingException(projectId, ,
projectDescriptor, e);
+}
}
MavenProject project;
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java?rev=758121r1=758120r2=758121view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ModelProcessor.java
Wed Mar 25 01:39:38 2009
@@ -21,7 +21,9 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
@@ -43,7 +45,7 @@
public void process( Object parent, Object child, Object target, boolean
isChildMostSpecialized )
{
super.process( parent, child, target, isChildMostSpecialized );
-
+
Model c = (Model) child;
Model t = (Model) target;
Model p = null;
@@ -151,6 +153,5 @@
}
t.getDependencyManagement().getDependencies().addAll( mngDeps );
}
-
}
}
Modified:
svn commit: r758122 - /maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Author: sisbell
Date: Wed Mar 25 01:41:14 2009
New Revision: 758122
URL: http://svn.apache.org/viewvc?rev=758122view=rev
Log:
Unit test was incorrect. Fixed it.
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=758122r1=758121r2=758122view=diff
==
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Wed Mar 25 01:41:14 2009
@@ -287,17 +287,17 @@
}
*/
-/* FIX - REGRESSION
+
public void testSingleConfigurationInheritance()
throws Exception
{
PomTestWrapper pom = buildPom( single-configuration-inheritance );
-System.out.println(pom.getDomainModel().asString());
+
assertEquals( 2, ( (List?) pom.getValue(
build/plugins[1]/executions[1]/configuration[1]/rules ) ).size() );
assertEquals(2.0.6, pom.getValue(
build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireMavenVersion[1]/version
) );
-assertEquals([2.0.6,), pom.getValue(
build/plugins[1]/executions[1]/configuration[1]/rules[2]/requireMavenVersion[1]/version
) );
+assertEquals([1.4,), pom.getValue(
build/plugins[1]/executions[1]/configuration[1]/rules[1]/requireJavaVersion[1]/version
) );
}
-*/
+
public void testConfigWithPluginManagement()
throws Exception
{
svn commit: r758127 - in /maven/components/trunk/maven-project: pom.xml src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
Author: sisbell Date: Wed Mar 25 02:16:16 2009 New Revision: 758127 URL: http://svn.apache.org/viewvc?rev=758127view=rev Log: t07 and t10 unit tests. Modified: maven/components/trunk/maven-project/pom.xml maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java Modified: maven/components/trunk/maven-project/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/pom.xml?rev=758127r1=758126r2=758127view=diff == --- maven/components/trunk/maven-project/pom.xml (original) +++ maven/components/trunk/maven-project/pom.xml Wed Mar 25 02:16:16 2009 @@ -145,8 +145,6 @@ configuration excludes exclude**/ProjectClasspathTest.java/exclude -exclude**/t07/ProjectInheritanceTest.java/exclude -exclude**/t10/ProjectInheritanceTest.java/exclude /excludes /configuration /plugin Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java?rev=758127r1=758126r2=758127view=diff == --- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (original) +++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java Wed Mar 25 02:16:16 2009 @@ -82,7 +82,8 @@ assertNotNull( c ); // inherited from depMgmt -assertTrue(Incorrect scope for + a.getDependencyConflictId(), a.getScope().equals(compile)); +System.out.println(a.getScope()); +assertTrue(Incorrect scope for + a.getDependencyConflictId(), a.getScope().equals(test)); // transitive dep, overridden b depMgmt assertTrue(Incorrect scope for + b.getDependencyConflictId(), b.getScope().equals(runtime));
