You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by oc...@apache.org on 2009/05/24 07:35:41 UTC
svn commit: r778088 [2/2] - in /maven/release/trunk: maven-release-manager/
maven-release-manager/src/main/java/org/apache/maven/shared/release/config/
maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/
maven-release-manager/src...
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java?rev=778088&r1=778087&r2=778088&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java Sun May 24 05:35:37 2009
@@ -30,6 +30,7 @@
import org.apache.maven.shared.release.config.ReleaseDescriptor;
import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
import org.apache.maven.shared.release.env.ReleaseEnvironment;
+import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -261,8 +262,8 @@
arguments += additionalProfiles;
}
}
- descriptor.setAdditionalArguments( arguments );
-
+ descriptor.setAdditionalArguments( arguments );
+
return descriptor;
}
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java?rev=778088&r1=778087&r2=778088&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PerformReleaseMojo.java Sun May 24 05:35:37 2009
@@ -24,6 +24,7 @@
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -112,8 +113,9 @@
}
releaseDescriptor.setCheckoutDirectory( workingDirectory.getAbsolutePath() );
- releaseDescriptor.setUseReleaseProfile( useReleaseProfile );
-
+ releaseDescriptor.setUseReleaseProfile( useReleaseProfile );
+ releaseDescriptor.setRootProjectPath( ReleaseUtil.getRootProjectPath( project ) );
+
if ( goals == null )
{
// set default
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java?rev=778088&r1=778087&r2=778088&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/StageReleaseMojo.java Sun May 24 05:35:37 2009
@@ -24,6 +24,7 @@
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseFailureException;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
+import org.apache.maven.shared.release.util.ReleaseUtil;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
@@ -122,7 +123,8 @@
releaseDescriptor.setCheckoutDirectory( workingDirectory.getAbsolutePath() );
releaseDescriptor.setUseReleaseProfile( useReleaseProfile );
-
+ releaseDescriptor.setRootProjectPath( ReleaseUtil.getRootProjectPath( project ) );
+
if ( goals == null )
{
// set default
Modified: maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java?rev=778088&r1=778087&r2=778088&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java (original)
+++ maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PerformReleaseMojoTest.java Sun May 24 05:35:37 2009
@@ -79,6 +79,35 @@
assertTrue( true );
}
+ public void testPerformWithFlatStructure()
+ throws Exception
+ {
+ PerformReleaseMojo mojo = getMojoWithProjectSite( "perform-with-flat-structure.xml" );
+
+ ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
+ releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+ File checkoutDirectory = getTestFile( "target/checkout" );
+ releaseDescriptor.setCheckoutDirectory( checkoutDirectory.getAbsolutePath() );
+ releaseDescriptor.setPerformGoals( "deploy site-deploy" );
+ releaseDescriptor.setScmSourceUrl( "scm:svn:file://localhost/target/svnroot/flat-multi-module/trunk/root-project" );
+
+ Mock mock = new Mock( ReleaseManager.class );
+
+ Constraint[] constraints = new Constraint[] {
+ new IsEqual( releaseDescriptor ),
+ new IsInstanceOf( ReleaseEnvironment.class ),
+ new IsNull()
+ };
+
+ mock.expects( new InvokeOnceMatcher() ).method( "perform" ).with( constraints );
+ mojo.setReleaseManager( (ReleaseManager) mock.proxy() );
+
+ mojo.execute();
+
+ assertTrue( true );
+ }
+
+
public void testPerformWithoutSite()
throws Exception
{
@@ -294,7 +323,7 @@
public void testPerformWithMultilineGoals()
throws Exception
{
- PerformReleaseMojo mojo = getMojoWithProjectSite( "perform-with-multiline-goals.xml" );
+ PerformReleaseMojo mojo = getMojoWithProjectSite( "perform-with-multiline-goals.xml" );
ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
releaseDescriptor.setWorkingDirectory( workingDirectory.getAbsolutePath() );
Added: maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java?rev=778088&view=auto
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java (added)
+++ maven/release/trunk/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java Sun May 24 05:35:37 2009
@@ -0,0 +1,86 @@
+package org.apache.maven.plugins.release.stubs;
+
+/*
+ * 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.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Scm;
+
+/**
+ * Stub for a MavenProject with a flat structure.
+ * <p/>
+ * TODO: shouldn't need to do this, but the "stub" in the harness just throws away values you set.
+ * Just overriding the ones I need for this plugin.
+ *
+ * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
+ * @noinspection ClassNameSameAsAncestorName
+ */
+public class FlatMultiModuleMavenProjectStub
+ extends org.apache.maven.plugin.testing.stubs.MavenProjectStub
+{
+ public void setDistributionManagement( DistributionManagement distributionManagement )
+ {
+ getModel().setDistributionManagement( distributionManagement );
+ }
+
+ public Model getModel()
+ {
+ Model model = super.getModel();
+ if ( model == null )
+ {
+ model = new Model();
+ setModel( model );
+ }
+ return model;
+ }
+
+ public DistributionManagement getDistributionManagement()
+ {
+ return getModel().getDistributionManagement();
+ }
+
+ public List getModules()
+ {
+ List modules = new ArrayList();
+ modules.add( "../core" );
+ modules.add( "../webapp" );
+ modules.add( "../commons" );
+
+ return modules;
+ }
+
+ public File getBasedir()
+ {
+ return new File( "/flat-multi-module/root-project" );
+ }
+
+ public Scm getScm()
+ {
+ Scm scm = new Scm();
+ scm.setConnection( "scm:svn:file://localhost/target/svnroot/flat-multi-module/trunk/root-project" );
+
+ return scm;
+ }
+
+}
Added: maven/release/trunk/maven-release-plugin/src/test/resources/mojos/perform/perform-with-flat-structure.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/test/resources/mojos/perform/perform-with-flat-structure.xml?rev=778088&view=auto
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/test/resources/mojos/perform/perform-with-flat-structure.xml (added)
+++ maven/release/trunk/maven-release-plugin/src/test/resources/mojos/perform/perform-with-flat-structure.xml Sun May 24 05:35:37 2009
@@ -0,0 +1,37 @@
+<?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>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <settings implementation="org.apache.maven.settings.Settings"/>
+ <project implementation="org.apache.maven.plugins.release.stubs.FlatMultiModuleMavenProjectStub"/>
+ <workingDirectory>${basedir}/target/checkout</workingDirectory>
+ <useReleaseProfile>true</useReleaseProfile>
+ <connectionUrl>scm:svn:file://localhost/target/svnroot/flat-multi-module/trunk/root-project</connectionUrl>
+ <goals>deploy</goals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file