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/07 13:25:20 UTC

[38/50] [abbrv] incubator-tinkerpop git commit: Attach binary zips to the build.

Attach binary zips to the build.

This simplifies the release process a bit as all artifacts are treated as equals (i.e. signed/hashed the same way)


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

Branch: refs/heads/variables
Commit: 679ecb02f4f5ff6e12ef4a6ee220a7256f6fe802
Parents: 16bf899
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 6 12:11:33 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 6 12:11:33 2015 -0400

----------------------------------------------------------------------
 README.asciidoc         |  15 +++--
 gremlin-console/pom.xml |   2 +-
 gremlin-server/pom.xml  |   2 +-
 pom.xml                 | 147 -------------------------------------------
 4 files changed, 9 insertions(+), 157 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679ecb02/README.asciidoc
----------------------------------------------------------------------
diff --git a/README.asciidoc b/README.asciidoc
index 61fada1..a3aaf82 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -32,15 +32,12 @@ Building and Testing
 
 * Build Project: `mvn clean install`
 ** Specify specific tests in a TinkerPop Suite to run: `mvn test -Dgremlin.tests={test class 1, test class 2...}` - note that including a specific test may require its inner class implementation (e.g. `org.apache.tinkerpop.gremlin....UnionTest$ComputerTest`)
-** Fast-build (does not run `neo4j-gremlin` tests - use with caution): `mvn clean install -DfeelingLucky`
 ** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes`
 * Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory
 * Build AsciiDocs: `docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc`
 * Build JavaDocs: `mvn process-resources -Djavadoc`
 * Check for Apache License headers: `mvn apache-rat:check`
 * Deploy JavaDocs/AsciiDocs: `bin/publish-docs.sh svn-username`
-* Generate signed binary distribution zip archives with checksums: `mvn clean install -Darchives -Pchecksum`
-* Generate signed source distribution zip archive (standard Apache configuration) with checksums: `mvn clean install -Papache-release -Pchecksum`
 * Integration Tests: `mvn verify -DskipIntegrationTests=false`
 * Performance Tests: `mvn verify -DskipPerformanceTests=false`
 * Gatling Load Tests: `mvn test -Pgatling -Dhost={hostname}`
@@ -82,15 +79,17 @@ Release Process
 . `git diff` and review the updated files (expect all `pom.xml` files and this README)
 . `git commit -a -m "TinkerPop x.y.z release"` and `git push`
 . `git tag -a -m "TinkerPop x.y.z release" x.y.z` and `git push --tags`
-. `mvn clean install -Papache-release -Pchecksum`- generate signed source distribution with checksums for upload to Apache release voting
-. `find . -name "*maven*" |xargs rm; scp -r . <username>@people.apache.org:~/public_html/tinkerpop-<version>/`
+. `bin/publish-docs.sh <username>`
+. `mvn deploy -Papache-release -DcreateChecksum=true -Dmaven.test.skip=true`- deploy signed artifacts with checksums to Apache Nexus for release voting
+. Close the staging repository
+. Upload zip distributions to: `https://dist.apache.org/repos/dist/dev/tinkerpop/`
 . Submit for `[VOTE]` at `general@incubator.apache.org`
 
 After a positive community "vote":
 
-. `git checkout `tags/x.y.z release"
-. `bin/publish-docs.sh <username>`
-. `mvn install -Parchives -Pchecksum -Dmaven.test.skip=true` - generate distributions for the release version with documentation included
+. Promote release in Nexus.
+. Remove previous release from `https://dist.apache.org/repos/dist/release/tinkerpop/`
+. Upload new zip distributions to `https://dist.apache.org/repos/dist/release/tinkerpop/`
 
 Issue Tracker Conventions
 ~~~~~~~~~~~~~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/679ecb02/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 64729d2..6479b18 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -118,7 +118,7 @@ limitations under the License.
                     </execution>
                 </executions>
                 <configuration>
-                    <attach>${attach-archives}</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/679ecb02/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 5db3e0e..7171539 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -114,7 +114,7 @@ limitations under the License.
                     </execution>
                 </executions>
                 <configuration>
-                    <attach>${attach-archives}</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/679ecb02/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d280062..6ec7517 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,11 +111,6 @@ limitations under the License.
         <hadoop.version>1.2.1</hadoop.version>
         <javadoc-plugin.version>2.10.1</javadoc-plugin.version>
         <muteTestLogs>false</muteTestLogs>
-
-        <!-- By default zip archives in gremlin-console/server are not attached and thus not subject to deployment.
-             When running the "archives" profile, deployment is disabled but zips are attached so they become
-             subject to gpg and other plugin actions -->
-        <attach-archives>false</attach-archives>
     </properties>
     <build>
         <directory>${basedir}/target</directory>
@@ -561,148 +556,6 @@ limitations under the License.
     <profiles>
 
         <profile>
-            <!-- This profile will force a signature of the gremlin-server/console zip files, but will prevent
-                 them from being deployed to a maven repo. -->
-            <id>archives</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>archives</name>
-                </property>
-            </activation>
-
-            <properties>
-                <attach-archives>true</attach-archives>
-            </properties>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </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>
-
-        <profile>
-            <!-- Generates sha1/md5 checksums for all zips.  This profile can be applied whether the
-                 zips are actually present or not (i.e. should not break anything if the files aren't present) -->
-            <id>checksum</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-
-            <properties>
-                <server.artifact>gremlin-server-${project.version}-distribution.zip
-                </server.artifact>
-                <console.artifact>gremlin-console-${project.version}-distribution.zip
-                </console.artifact>
-                <tinkerpop.artifact>tinkerpop-${project.version}-source-release.zip
-                </tinkerpop.artifact>
-            </properties>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                            <execution>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <inherited>true</inherited>
-                                <configuration>
-                                    <tasks>
-                                        <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>
-                </plugins>
-            </build>
-        </profile>
-
-        <profile>
             <id>asciidoc</id>
             <activation>
                 <activeByDefault>false</activeByDefault>