You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/03 17:30:12 UTC
incubator-tinkerpop git commit: Make it so that md5/sha/gpg all occur
in the apache release profile.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 88e9b9dac -> 8234943c7
Make it so that md5/sha/gpg all occur in the apache release profile.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8234943c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8234943c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8234943c
Branch: refs/heads/master
Commit: 8234943c7f64a00682c9289f222abb62112281df
Parents: 88e9b9d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 3 11:29:44 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 3 11:29:44 2015 -0400
----------------------------------------------------------------------
README.asciidoc | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-server/pom.xml | 2 +-
pom.xml | 116 ++++++++++++++++++++++++++++---------------
4 files changed, 79 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8234943c/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index 6274719..056bb85 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -43,7 +43,7 @@ Building and Testing
* Integration Tests: `mvn verify -DskipIntegrationTests=false`
* Performance Tests: `mvn verify -DskipPerformanceTests=false`
* Gatling Load Tests: `mvn test -Pgatling -Dhost={hostname}`
-* Generate "Apache Release" artifacts to the root `target/dist` directory: `mvn clean install -Dapache`
+* Generate "Apache Release" artifacts (signed with associated MD5/SHA1 checksum) to the root `target/dist` directory: `mvn clean install -Dapache`
IDE Setup
^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8234943c/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index a5441bb..bc6362d 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -118,7 +118,7 @@ limitations under the License.
</execution>
</executions>
<configuration>
- <attach>false</attach>
+ <attach>true</attach>
<descriptors>
<descriptor>src/assembly/standalone.xml</descriptor>
<descriptor>src/assembly/distribution.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8234943c/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 39aa72d..6621fdf 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -114,7 +114,7 @@ limitations under the License.
</execution>
</executions>
<configuration>
- <attach>false</attach>
+ <attach>true</attach>
<descriptors>
<descriptor>src/assembly/standalone.xml</descriptor>
<descriptor>src/assembly/distribution.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8234943c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5886549..968a1e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,23 +124,6 @@ limitations under the License.
</extensions>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<executions>
@@ -581,10 +564,12 @@ limitations under the License.
</activation>
<properties>
- <server.artifact>gremlin-server/target/gremlin-server-${project.version}-distribution.zip
+ <server.artifact>gremlin-server-${project.version}-distribution.zip
</server.artifact>
- <console.artifact>gremlin-console/target/gremlin-console-${project.version}-distribution.zip
+ <console.artifact>gremlin-console-${project.version}-distribution.zip
</console.artifact>
+ <tinkerpop.artifact>tinkerpop-${project.version}-src.zip
+ </tinkerpop.artifact>
</properties>
<build>
@@ -602,12 +587,12 @@ limitations under the License.
</executions>
<inherited>false</inherited>
<configuration>
- <attach>false</attach>
+ <attach>true</attach>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<finalName>${project.artifactId}-${project.version}</finalName>
- <outputDirectory>target/dist</outputDirectory>
+ <outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
<tarLongFileMode>warn</tarLongFileMode>
</configuration>
@@ -615,44 +600,95 @@ limitations under the License.
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
- <inherited>false</inherited>
<executions>
<execution>
- <!-- make sure this runs after the package phase -->
- <phase>verify</phase>
+ <phase>install</phase>
<goals>
<goal>run</goal>
</goals>
+ <inherited>true</inherited>
<configuration>
<tasks>
- <copy todir="target/dist" flatten="true">
- <fileset dir="${basedir}">
- <include name="${server.artifact}" />
- <include name="${console.artifact}" />
- </fileset>
- </copy>
- <checksum algorithm="MD5" fileext=".md5">
- <fileset dir="target/dist">
- <include name="*.zip" />
- </fileset>
- </checksum>
- <checksum algorithm="SHA1" fileext=".sha">
- <fileset dir="target/dist">
- <include name="*.zip" />
- </fileset>
- </checksum>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+ <if>
+ <available file="target/${server.artifact}"/>
+ <then>
+ <checksum algorithm="MD5" fileext=".md5">
+ <fileset dir="target">
+ <include name="*.zip" />
+ </fileset>
+ </checksum>
+ <checksum algorithm="SHA1" fileext=".sha">
+ <fileset dir="target">
+ <include name="*.zip" />
+ </fileset>
+ </checksum>
+ </then>
+ </if>
+ <if>
+ <available file="target/${console.artifact}"/>
+ <then>
+ <checksum algorithm="MD5" fileext=".md5">
+ <fileset dir="target">
+ <include name="*.zip" />
+ </fileset>
+ </checksum>
+ <checksum algorithm="SHA1" fileext=".sha">
+ <fileset dir="target">
+ <include name="*.zip" />
+ </fileset>
+ </checksum>
+ </then>
+ </if>
+ <if>
+ <available file="target/${tinkerpop.artifact}"/>
+ <then>
+ <checksum algorithm="MD5" fileext=".md5">
+ <fileset dir="target">
+ <include name="*.zip" />
+ </fileset>
+ </checksum>
+ <checksum algorithm="SHA1" fileext=".sha">
+ <fileset dir="target">
+ <include name="*.zip" />
+ </fileset>
+ </checksum>
+ </then>
+ </if>
</tasks>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>20020829</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>sign-attached-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <ascDirectory>target</ascDirectory>
+ </configuration>
+ </plugin>
</plugins>
</build>
</profile>