Author: jdcasey
Date: Fri Sep 16 09:27:33 2005
New Revision: 289599
URL: http://svn.apache.org/viewcvs?rev=289599&view=rev
Log:
Resolving: MNG-881. This had to do with resource-list merging when the
performRelease profile was activated. See MNG-895 for full resolution (this is
a stop-gap solution for now).
Added:
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/plexus/
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/plexus/components.xml
(with props)
maven/components/trunk/maven-core-it/it2002/project/src/test/
maven/components/trunk/maven-core-it/it2002/project/src/test/java/
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/it2002/
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/it2002/ContainerDependentTest.java
(with props)
Modified:
maven/components/trunk/maven-core-it/it2002/project/pom.xml
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
maven/components/trunk/maven-core-it/it2002/test.sh
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
Modified: maven/components/trunk/maven-core-it/it2002/project/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/pom.xml?rev=289599&r1=289598&r2=289599&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/project/pom.xml (original)
+++ maven/components/trunk/maven-core-it/it2002/project/pom.xml Fri Sep 16
09:27:33 2005
@@ -7,8 +7,21 @@
<dependencies>
<dependency>
<groupId>plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0-beta-1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0-beta-1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified:
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java?rev=289599&r1=289598&r2=289599&view=diff
==============================================================================
---
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
(original)
+++
maven/components/trunk/maven-core-it/it2002/project/src/main/java/org/apache/maven/it2002/Thing.java
Fri Sep 16 09:27:33 2005
@@ -2,6 +2,8 @@
public class Thing
{
+ public static final String ROLE = Thing.class.getName();
+
private String type;
}
Added:
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/plexus/components.xml?rev=289599&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/plexus/components.xml
(added)
+++
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/plexus/components.xml
Fri Sep 16 09:27:33 2005
@@ -0,0 +1,8 @@
+<component-set>
+ <components>
+ <component>
+ <role>org.apache.maven.it2002.Thing</role>
+ <implementation>org.apache.maven.it2002.Thing</implementation>
+ </component>
+ </components>
+</component-set>
\ No newline at end of file
Propchange:
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it2002/project/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/it2002/ContainerDependentTest.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/it2002/ContainerDependentTest.java?rev=289599&view=auto
==============================================================================
---
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/it2002/ContainerDependentTest.java
(added)
+++
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/it2002/ContainerDependentTest.java
Fri Sep 16 09:27:33 2005
@@ -0,0 +1,20 @@
+package org.apache.maven.it2002;
+
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.codehaus.plexus.PlexusTestCase;
+
+public class ContainerDependentTest extends PlexusTestCase
+{
+
+ public void testOne() throws Exception
+ {
+ ArtifactResolver resolver = (ArtifactResolver) lookup(
ArtifactResolver.ROLE );
+
+ assertNotNull( resolver );
+
+ Thing thing = (Thing) lookup( Thing.ROLE );
+
+ assertNotNull( thing );
+ }
+
+}
Propchange:
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/it2002/ContainerDependentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-core-it/it2002/project/src/test/java/org/apache/maven/it2002/ContainerDependentTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-core-it/it2002/test.sh
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it2002/test.sh?rev=289599&r1=289598&r2=289599&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it2002/test.sh (original)
+++ maven/components/trunk/maven-core-it/it2002/test.sh Fri Sep 16 09:27:33 2005
@@ -7,8 +7,6 @@
svnadmin create --fs-type fsfs target/svnroot
-rm -Rf `find project -type d -name .svn`
-
dir=`readlink -f ${PWD}`
svn import project file://${dir}/target/svnroot/project/trunk -m "import."
@@ -22,6 +20,9 @@
#. ~/shell-switches/m2-debug-on
#echo "Enabling debugging options. Please attach the debugger."
+
+export MAVEN_OPTS=
m2 -e release:prepare
+m2 -e release:perform
Modified:
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java?rev=289599&r1=289598&r2=289599&view=diff
==============================================================================
---
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
(original)
+++
maven/components/trunk/maven-plugins/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
Fri Sep 16 09:27:33 2005
@@ -103,12 +103,17 @@
cl.createArgument().setLine( "--no-plugin-updates" );
cl.createArgument().setLine( "--batch-mode" );
-
+
StreamConsumer consumer = new DefaultConsumer();
try
{
- CommandLineUtils.executeCommandLine( cl, consumer, consumer );
+ int result = CommandLineUtils.executeCommandLine( cl, consumer,
consumer );
+
+ if ( result != 0 )
+ {
+ throw new MojoExecutionException("Result of m2 execution is:
\'" + result + "\'. Release failed." );
+ }
}
catch ( CommandLineException e )
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java?rev=289599&r1=289598&r2=289599&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/injection/DefaultProfileInjector.java
Fri Sep 16 09:27:33 2005
@@ -101,7 +101,7 @@
List profileResources = profileBuild.getResources();
- if ( profileResources != null )
+ if ( profileResources != null && !profileResources.isEmpty() )
{
modelBuild.setResources( profileResources );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
