You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/12/03 00:42:34 UTC
svn commit: r1643023 [2/2] - in /maven/release/trunk: ./
maven-release-api/src/main/java/org/apache/maven/shared/release/policy/
maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/
maven-release-api/src/main/java/org/apache/...
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/CleanReleaseMojo.java Tue Dec 2 23:42:32 2014
@@ -28,7 +28,8 @@ import org.apache.maven.shared.release.c
* Clean up after a release preparation. This is done automatically after a successful <tt>release:perform</tt>,
* so is best served for cleaning up a failed or abandoned release, or a dry run. Note that only the working copy
* is cleaned up, no previous steps are rolled back.
- * For more info see <a href="http://maven.apache.org/plugins/maven-release-plugin/examples/clean-release.html">http://maven.apache.org/plugins/maven-release-plugin/examples/clean-release.html</a>.
+ * For more info see <a href="http://maven.apache.org/plugins/maven-release-plugin/examples/clean-release.html"
+ * >http://maven.apache.org/plugins/maven-release-plugin/examples/clean-release.html</a>.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
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=1643023&r1=1643022&r2=1643023&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 Tue Dec 2 23:42:32 2014
@@ -34,7 +34,8 @@ import org.codehaus.plexus.util.StringUt
/**
* Perform a release from SCM, either from a specified tag, or the tag representing the previous release in
* the working copy created by <tt>release:prepare</tt>.
- * For more info see <a href="http://maven.apache.org/plugins/maven-release-plugin/examples/perform-release.html">http://maven.apache.org/plugins/maven-release-plugin/examples/perform-release.html</a>.
+ * For more info see <a href="http://maven.apache.org/plugins/maven-release-plugin/examples/perform-release.html"
+ * >http://maven.apache.org/plugins/maven-release-plugin/examples/perform-release.html</a>.
*
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
@@ -146,7 +147,7 @@ public class PerformReleaseMojo
releaseDescriptor.setScmUsername( username );
}
- if( password != null )
+ if ( password != null )
{
releaseDescriptor.setScmPassword( password );
}
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Tue Dec 2 23:42:32 2014
@@ -233,8 +233,8 @@ public class PrepareReleaseMojo
{
if ( generateReleasePoms )
{
- throw new MojoFailureException(
- "Generating release POMs is no longer supported in release:prepare. Please run release:prepare-with-pom instead." );
+ throw new MojoFailureException( "Generating release POMs is no longer supported in release:prepare. "
+ + "Please run release:prepare-with-pom instead." );
}
prepareRelease( generateReleasePoms );
Modified: maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java (original)
+++ maven/release/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/RollbackReleaseMojo.java Tue Dec 2 23:42:32 2014
@@ -27,15 +27,16 @@ import org.apache.maven.shared.release.R
import org.apache.maven.shared.release.config.ReleaseDescriptor;
/**
- * Rollback changes made by a previous release. This requires that the previous release descriptor <tt>release.properties</tt>
- * is still available in the local working copy.
- * For more info see <a href="http://maven.apache.org/plugins/maven-release-plugin/examples/rollback-release.html">http://maven.apache.org/plugins/maven-release-plugin/examples/rollback-release.html</a>.
+ * Rollback changes made by a previous release. This requires that the previous release descriptor
+ * <tt>release.properties</tt> is still available in the local working copy. For more info see <a
+ * href="http://maven.apache.org/plugins/maven-release-plugin/examples/rollback-release.html"
+ * >http://maven.apache.org/plugins/maven-release-plugin/examples/rollback-release.html</a>.
*
* @since 2.0-beta-5
* @author Edwin Punzalan
* @version $Id$
*/
-@Mojo( name="rollback", aggregator = true )
+@Mojo( name = "rollback", aggregator = true )
public class RollbackReleaseMojo
extends AbstractScmReleaseMojo
{
Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java (original)
+++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java Tue Dec 2 23:42:32 2014
@@ -55,7 +55,8 @@ public final class OddEvenVersionPolicy
return calculateNextVersion( request, true );
}
- private VersionPolicyResult calculateNextVersion( VersionPolicyRequest request, boolean development ) {
+ private VersionPolicyResult calculateNextVersion( VersionPolicyRequest request, boolean development )
+ {
DefaultVersionInfo defaultVersionInfo = null;
try
Modified: maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java (original)
+++ maven/release/trunk/maven-release-policies/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java Tue Dec 2 23:42:32 2014
@@ -1,10 +1,10 @@
+// CHECKSTYLE_OFF: RegexpHeader
/**
- * A {@link VersionPolicy} implementation that allows release even version numbers only and skips the odd.
+ * A {@link org.apache.maven.shared.release.policy.version.VersionPolicy VersionPolicy} implementation that allows
+ * release even version numbers only and skips the odd.
*/
package org.apache.maven.shared.release.policy.oddeven;
-import org.apache.maven.shared.release.policy.version.VersionPolicy;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/release/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1643023&r1=1643022&r2=1643023&view=diff
==============================================================================
--- maven/release/trunk/pom.xml (original)
+++ maven/release/trunk/pom.xml Tue Dec 2 23:42:32 2014
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>24</version>
+ <version>26</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
@@ -104,18 +104,4 @@
</dependency>
</dependencies>
</dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin><!-- TODO remove when upgrading maven-parent to 25 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
</project>