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/fd115177 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd115177 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd115177 Branch: refs/heads/TINKERPOP-1967 Commit: fd115177f2c3ebe72adb308e4505a633dc49bbe7 Parents: c125fc9 Author: Florian Hockmann <f...@florian-hockmann.de> Authored: Sun Apr 15 14:08:51 2018 +0200 Committer: Florian Hockmann <f...@florian-hockmann.de> Committed: Mon Jun 4 15:57:29 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/fd115177/gremlin-console/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml index b24c772..db86d41 100644 --- a/gremlin-console/pom.xml +++ b/gremlin-console/pom.xml @@ -345,30 +345,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/fd115177/gremlin-server/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml index e71f79b..ef2e609 100644 --- a/gremlin-server/pom.xml +++ b/gremlin-server/pom.xml @@ -253,30 +253,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/fd115177/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 19866f0..9ff3f3a 100644 --- a/pom.xml +++ b/pom.xml @@ -264,6 +264,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> @@ -502,11 +526,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>
