tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From florianhockm...@apache.org
Subject tinkerpop git commit: TINKERPOP-1897 Move snapshot detection to root pom.xml [Forced Update!]
Date Sun, 15 Apr 2018 12:09:08 GMT
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1897 716490bb0 -> 063b97a06 (forced update)


TINKERPOP-1897 Move snapshot detection to root pom.xml


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

Branch: refs/heads/TINKERPOP-1897
Commit: 063b97a06a3840a8ff9941b4f6c76b16c5519e74
Parents: a1844d0
Author: Florian Hockmann <fh@florian-hockmann.de>
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann <fh@florian-hockmann.de>
Committed: Sun Apr 15 14:08:51 2018 +0200

----------------------------------------------------------------------
 gremlin-console/pom.xml | 25 +------------------------
 gremlin-server/pom.xml  | 25 +------------------------
 pom.xml                 | 29 ++++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/063b97a0/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index fb1c32b..dd3d81b 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -346,30 +346,7 @@ limitations under the License.
                 </file>
             </activation>
             <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <!-- source: https://stackoverflow.com/a/39139979/6753576
-->
-                                <!-- sets the only.when.is.snapshot.used property to true
if SNAPSHOT was used, 
-                                    to the project version otherwise -->
-                                <id>build-helper-regex-is-snapshot-used</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>regex-property</goal>
-                                </goals>
-                                <configuration>
-                                    <name>only.when.is.snapshot.used</name>
-                                    <value>${project.version}</value>
-                                    <regex>.*-SNAPSHOT</regex>
-                                    <replacement>true</replacement>
-                                    <failIfNoMatch>false</failIfNoMatch>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
+                <plugins>                    
                     <plugin>
                         <groupId>com.spotify</groupId>
                         <artifactId>dockerfile-maven-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/063b97a0/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 2035210..77448e3 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -254,30 +254,7 @@ limitations under the License.
                 </file>
             </activation>
             <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <!-- source: https://stackoverflow.com/a/39139979/6753576
-->
-                                <!-- sets the only.when.is.snapshot.used property to true
if SNAPSHOT was used, 
-                                    to the project version otherwise -->
-                                <id>build-helper-regex-is-snapshot-used</id>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>regex-property</goal>
-                                </goals>
-                                <configuration>
-                                    <name>only.when.is.snapshot.used</name>
-                                    <value>${project.version}</value>
-                                    <regex>.*-SNAPSHOT</regex>
-                                    <replacement>true</replacement>
-                                    <failIfNoMatch>false</failIfNoMatch>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
+                <plugins>                    
                     <plugin>
                         <groupId>com.spotify</groupId>
                         <artifactId>dockerfile-maven-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/063b97a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14e7a42..e646b7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,6 +258,30 @@ limitations under the License.
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <!-- source: https://stackoverflow.com/a/39139979/6753576 -->
+                        <!-- sets the only.when.is.snapshot.used property to true if SNAPSHOT
was used, 
+                            to the project version otherwise -->
+                        <id>build-helper-regex-is-snapshot-used</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>regex-property</goal>
+                        </goals>
+                        <configuration>
+                            <name>only.when.is.snapshot.used</name>
+                            <value>${project.version}</value>
+                            <regex>.*-SNAPSHOT</regex>
+                            <replacement>true</replacement>
+                            <failIfNoMatch>false</failIfNoMatch>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.0.2</version>
@@ -496,11 +520,6 @@ limitations under the License.
                     <artifactId>dockerfile-maven-plugin</artifactId>
                     <version>1.3.7</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
             </plugins>
         </pluginManagement>
     </build>


Mime
View raw message