TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

Tags like 3.2 should only point to stable releases.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aac534e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aac534e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aac534e1

Branch: refs/heads/TINKERPOP-1967
Commit: aac534e11fa406bedc61dbc060d06740b898e170
Parents: 144c698
Author: Florian Hockmann <f...@florian-hockmann.de>
Authored: Mon Jun 4 20:41:00 2018 +0200
Committer: Florian Hockmann <f...@florian-hockmann.de>
Committed: Mon Jun 4 20:41:00 2018 +0200

----------------------------------------------------------------------
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml                 | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 29df2a4..8a4a12c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -379,7 +379,7 @@ limitations under the License.
                                 </goals>
                                 <configuration>
                                     
<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
-                                    <skip>${only.when.is.snapshot.used}</skip>
+                                    
<skip>${only.when.is.prerelease.version}</skip>
                                 </configuration>
                             </execution>
                             <execution>
@@ -401,7 +401,7 @@ limitations under the License.
                                 </goals>
                                 <configuration>
                                     
<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
-                                    <skip>${only.when.is.snapshot.used}</skip>
+                                    
<skip>${only.when.is.prerelease.version}</skip>
                                 </configuration>
                             </execution>
                         </executions>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index a75b6c5..517f029 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -287,7 +287,7 @@ limitations under the License.
                                 </goals>
                                 <configuration>
                                     
<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
-                                    <skip>${only.when.is.snapshot.used}</skip>
+                                    
<skip>${only.when.is.prerelease.version}</skip>
                                 </configuration>
                             </execution>
                             <execution>
@@ -309,7 +309,7 @@ limitations under the License.
                                 </goals>
                                 <configuration>
                                     
<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}</tag>
-                                    <skip>${only.when.is.snapshot.used}</skip>
+                                    
<skip>${only.when.is.prerelease.version}</skip>
                                 </configuration>
                             </execution>
                         </executions>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f2484f8..a9be62d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,22 @@ limitations under the License.
                         </configuration>
                     </execution>
                     <execution>
+                        <!-- sets the only.when.is.prerelease.version property 
to true if a prerelease version was used, 
+                            to the project version otherwise -->
+                        <id>build-helper-regex-is-prerelease-version</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>regex-property</goal>
+                        </goals>
+                        <configuration>
+                            <name>only.when.is.prerelease.version</name>
+                            <value>${project.version}</value>
+                            <regex>.*-.*</regex>
+                            <replacement>true</replacement>
+                            <failIfNoMatch>false</failIfNoMatch>
+                        </configuration>
+                    </execution>
+                    <execution>
                         <id>parse-version</id>
                         <goals>
                             <goal>parse-version</goal>

Reply via email to