Author: simonetripodi
Date: Mon Mar 24 09:30:14 2014
New Revision: 1580793
URL: http://svn.apache.org/r1580793
Log:
MRELEASE-431 - Configuration of policy for calculating next (release) version
initial checkin of the odd-even VersionPolicy implementation, as a separated
module
Added:
maven/release/trunk/maven-release-oddeven-policy/ (with props)
maven/release/trunk/maven-release-oddeven-policy/pom.xml (with props)
maven/release/trunk/maven-release-oddeven-policy/src/
maven/release/trunk/maven-release-oddeven-policy/src/main/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
(with props)
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java
(with props)
maven/release/trunk/maven-release-oddeven-policy/src/test/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicyTestCase.java
(with props)
Modified:
maven/release/trunk/pom.xml
Propchange: maven/release/trunk/maven-release-oddeven-policy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 24 09:30:14 2014
@@ -0,0 +1,2 @@
+.settings
+target
Added: maven/release/trunk/maven-release-oddeven-policy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-oddeven-policy/pom.xml?rev=1580793&view=auto
==============================================================================
--- maven/release/trunk/maven-release-oddeven-policy/pom.xml (added)
+++ maven/release/trunk/maven-release-oddeven-policy/pom.xml Mon Mar 24
09:30:14 2014
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.release</groupId>
+ <artifactId>maven-release</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-release-oddeven-policy</artifactId>
+
+ <name>Maven Release Odd-Even Policy</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>maven-release-policy</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>maven-release-manager</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.5.5</version>
+ <executions>
+ <execution>
+ <id>process-classes</id>
+ <goals>
+ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Propchange: maven/release/trunk/maven-release-oddeven-policy/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/release/trunk/maven-release-oddeven-policy/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: maven/release/trunk/maven-release-oddeven-policy/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
maven/release/trunk/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-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java?rev=1580793&view=auto
==============================================================================
---
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
(added)
+++
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
Mon Mar 24 09:30:14 2014
@@ -0,0 +1,121 @@
+package org.apache.maven.shared.release.policy.oddeven;
+
+/*
+ * 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.util.List;
+
+import org.apache.maven.shared.release.policy.PolicyException;
+import org.apache.maven.shared.release.policy.version.VersionPolicy;
+import org.apache.maven.shared.release.policy.version.VersionPolicyRequest;
+import org.apache.maven.shared.release.policy.version.VersionPolicyResult;
+import org.apache.maven.shared.release.versions.DefaultVersionInfo;
+import org.apache.maven.shared.release.versions.VersionInfo;
+import org.apache.maven.shared.release.versions.VersionParseException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * A {@link VersionPolicy} implementation that allows release even version
numbers only and skips the odd.
+ */
+@Component(
+ role = VersionPolicy.class,
+ hint = "OddEvenVersionPolicy",
+ description = "A VersionPolicy implementation that allows release even
version numbers"
+)
+public final class OddEvenVersionPolicy
+ implements VersionPolicy
+{
+
+ public VersionPolicyResult getReleaseVersion( VersionPolicyRequest request
)
+ throws PolicyException
+ {
+ return calculateNextVersion( request, false );
+ }
+
+ public VersionPolicyResult getDevelopmentVersion( VersionPolicyRequest
request )
+ throws PolicyException
+ {
+ return calculateNextVersion( request, true );
+ }
+
+ private VersionPolicyResult calculateNextVersion( VersionPolicyRequest
request, boolean development ) {
+ DefaultVersionInfo defaultVersionInfo = null;
+
+ try
+ {
+ defaultVersionInfo = new DefaultVersionInfo( request.getVersion()
);
+ }
+ catch ( VersionParseException e )
+ {
+ throw new IllegalArgumentException( "Can't tell if version with no
digits is even: " + e.getMessage(), e );
+ }
+
+ // by default, never reuse revisions
+ int versionNumbersToSkip = 1;
+
+ // do we need a snapshot? make sure the version info is odd
+ if ( development && !isEven( defaultVersionInfo ) )
+ {
+ versionNumbersToSkip = 2;
+ }
+
+ // do we need a release? make sure the version info is even
+ if ( !development && isEven( defaultVersionInfo ) )
+ {
+ versionNumbersToSkip = 0;
+ }
+
+ VersionInfo suggestedVersionInfo = defaultVersionInfo;
+ while ( versionNumbersToSkip != 0 )
+ {
+ suggestedVersionInfo = suggestedVersionInfo.getNextVersion();
+ versionNumbersToSkip--;
+ }
+
+ String nextVersion = development ?
suggestedVersionInfo.getSnapshotVersionString()
+ :
suggestedVersionInfo.getReleaseVersionString();
+
+ return new VersionPolicyResult().setVersion( nextVersion );
+ }
+
+ private boolean isEven( DefaultVersionInfo defaultVersionInfo )
+ {
+ int mostSignificantSegment;
+
+ if ( StringUtils.isNumeric( defaultVersionInfo.getAnnotationRevision()
) )
+ {
+ mostSignificantSegment = Integer.parseInt(
defaultVersionInfo.getAnnotationRevision() );
+ }
+ else
+ {
+ List<String> digits = defaultVersionInfo.getDigits();
+
+ if ( digits == null )
+ {
+ throw new IllegalArgumentException( "Can't tell if version
with no digits is even." );
+ }
+
+ mostSignificantSegment = Integer.parseInt( digits.get(
digits.size() - 1 ) );
+ }
+
+ return mostSignificantSegment % 2 == 0;
+ }
+
+}
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicy.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/release/trunk/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-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java?rev=1580793&view=auto
==============================================================================
---
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java
(added)
+++
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java
Mon Mar 24 09:30:14 2014
@@ -0,0 +1,25 @@
+/**
+ * A {@link 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
+ * 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.
+ */
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/main/java/org/apache/maven/shared/release/policy/oddeven/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicyTestCase.java
URL:
http://svn.apache.org/viewvc/maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicyTestCase.java?rev=1580793&view=auto
==============================================================================
---
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicyTestCase.java
(added)
+++
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicyTestCase.java
Mon Mar 24 09:30:14 2014
@@ -0,0 +1,72 @@
+package org.apache.maven.shared.release.policy.oddeven;
+
+/*
+ * 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 static org.junit.Assert.assertEquals;
+
+import org.apache.maven.shared.release.policy.version.VersionPolicy;
+import org.apache.maven.shared.release.policy.version.VersionPolicyRequest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public final class OddEvenVersionPolicyTestCase
+{
+
+ private VersionPolicy versionPolicy;
+
+ @Before
+ public void setUp()
+ {
+ versionPolicy = new OddEvenVersionPolicy();
+ }
+
+ @After
+ public void tearDown()
+ {
+ versionPolicy = null;
+ }
+
+ @Test
+ public void testConvertToSnapshot()
+ throws Exception
+ {
+ String suggestedVersion = versionPolicy.getDevelopmentVersion(
newVersionPolicyRequest( "1.0.0" ) )
+ .getVersion();
+
+ assertEquals( "1.0.1-SNAPSHOT", suggestedVersion );
+ }
+
+ @Test
+ public void testConvertToRelease()
+ throws Exception
+ {
+ String suggestedVersion = versionPolicy.getReleaseVersion(
newVersionPolicyRequest( "1.0.0-SNAPSHOT" ) )
+ .getVersion();
+
+ assertEquals( "1.0.0", suggestedVersion );
+ }
+
+ private static VersionPolicyRequest newVersionPolicyRequest( String
version )
+ {
+ return new VersionPolicyRequest().setVersion( version );
+ }
+
+}
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicyTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicyTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
maven/release/trunk/maven-release-oddeven-policy/src/test/java/org/apache/maven/shared/release/policy/oddeven/OddEvenVersionPolicyTestCase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: maven/release/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/release/trunk/pom.xml?rev=1580793&r1=1580792&r2=1580793&view=diff
==============================================================================
--- maven/release/trunk/pom.xml (original)
+++ maven/release/trunk/pom.xml Mon Mar 24 09:30:14 2014
@@ -40,6 +40,7 @@
<module>maven-release-policy</module>
<module>maven-release-manager</module>
<module>maven-release-plugin</module>
+ <module>maven-release-oddeven-policy</module>
</modules>
<scm>
