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 2016/08/08 10:49:45 UTC
[2/5] tinkerpop git commit: Renamed zip distributions to prefix with
"apache-tinkerpop-"
Renamed zip distributions to prefix with "apache-tinkerpop-"
It was formerly "apache-". Tested release docs as best I could given that this wasn't an actual release. Couldn't test validate-distribution.sh but that usually requires some tweaks here and there anyway on release day. TINKERPOP-1376 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6bf0d3b5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6bf0d3b5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6bf0d3b5
Branch: refs/heads/TINKERPOP-1350
Commit: 6bf0d3b5df3f5bdf7dd5bbce9d2bc8daeffda5a2
Parents: 1a4a321
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 3 11:53:48 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 3 11:53:48 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
bin/validate-distribution.sh | 4 ++--
docs/src/dev/developer/release.asciidoc | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-console/src/assembly/distribution.xml | 16 ++++++++--------
gremlin-server/pom.xml | 2 +-
gremlin-server/src/assembly/distribution.xml | 12 ++++++------
7 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8735a87..306185c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -27,6 +27,7 @@ TinkerPop 3.1.4 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Fixed a potential leak of a `ReferenceCounted` resource in Gremlin Server.
+* Renamed distributions to make the prefix "apache-tinkerpop-" as opposed to just "apache-".
[[release-3-1-3]]
TinkerPop 3.1.3 (Release Date: July 18, 2016)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index 30a0345..dcaf8fb 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -39,8 +39,8 @@ fi
if [ -z ${URL} ]; then
- CONSOLE_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-gremlin-console-${VERSION}-bin.zip"
- SERVER_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-gremlin-server-${VERSION}-bin.zip"
+ CONSOLE_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-tinkerpop-gremlin-console-${VERSION}-bin.zip"
+ SERVER_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-tinkerpop-gremlin-server-${VERSION}-bin.zip"
SOURCE_URL="https://dist.apache.org/repos/dist/dev/tinkerpop/${VERSION}/apache-tinkerpop-${VERSION}-src.zip"
echo -e "\nValidating binary distributions\n"
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index b1586f8..0c21bb6 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -121,7 +121,7 @@ handled document generation and this step now merely needs to upload what was ge
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-server/xx.yy.zz/gremlin-server-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/tinkerpop/xx.yy.zz/tinkerpop-xx.yy.zz-source-release.zip* dev/xx.yy.zz`
.. `cd dev/xx.yy.zz`
-.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
+.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-tinkerpop-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
.. `cd ..; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
. Execute `bin/validate-distribution.sh` and any other relevant testing.
. `git tag -a -m "TinkerPop xx.yy.zz release" xx.yy.zz` and `git push --tags`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 54e66f8..817f352 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -176,7 +176,7 @@ limitations under the License.
<descriptor>src/assembly/standalone.xml</descriptor>
<descriptor>src/assembly/distribution.xml</descriptor>
</descriptors>
- <finalName>apache-${project.artifactId}-${project.version}</finalName>
+ <finalName>apache-tinkerpop-${project.artifactId}-${project.version}</finalName>
<outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
<tarLongFileMode>warn</tarLongFileMode>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/gremlin-console/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/src/assembly/distribution.xml b/gremlin-console/src/assembly/distribution.xml
index 69ecc3b..9f13b41 100644
--- a/gremlin-console/src/assembly/distribution.xml
+++ b/gremlin-console/src/assembly/distribution.xml
@@ -22,7 +22,7 @@ limitations under the License.
<fileSets>
<fileSet>
<fileMode>0775</fileMode>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/bin</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.sh</include>
@@ -31,7 +31,7 @@ limitations under the License.
</fileSet>
<fileSet>
<fileMode>0775</fileMode>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/bin/hadoop</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/bin/hadoop</directory>
<outputDirectory>bin/hadoop</outputDirectory>
<includes>
<include>*.sh</include>
@@ -43,27 +43,27 @@ limitations under the License.
<outputDirectory>licenses</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/conf</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/conf</directory>
<outputDirectory>conf</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/data</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/data</directory>
<outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/docs</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/javadocs</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/javadocs</directory>
<outputDirectory>javadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/ext</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/ext</directory>
<outputDirectory>ext</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/lib</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/lib</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>
</fileSets>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 0f54cca..bed34eb 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -124,7 +124,7 @@ limitations under the License.
<descriptor>src/assembly/standalone.xml</descriptor>
<descriptor>src/assembly/distribution.xml</descriptor>
</descriptors>
- <finalName>apache-${project.artifactId}-${project.version}</finalName>
+ <finalName>apache-tinkerpop-${project.artifactId}-${project.version}</finalName>
<outputDirectory>target</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
<tarLongFileMode>warn</tarLongFileMode>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6bf0d3b5/gremlin-server/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/src/assembly/distribution.xml b/gremlin-server/src/assembly/distribution.xml
index d336fe8..e132a81 100644
--- a/gremlin-server/src/assembly/distribution.xml
+++ b/gremlin-server/src/assembly/distribution.xml
@@ -22,7 +22,7 @@ limitations under the License.
<fileSets>
<fileSet>
<fileMode>0775</fileMode>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/bin</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.sh</include>
@@ -37,26 +37,26 @@ limitations under the License.
<outputDirectory>licenses</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/data</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/data</directory>
<outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
<directory>scripts</directory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/ext</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/ext</directory>
<outputDirectory>ext</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/docs</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/javadocs</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/javadocs</directory>
<outputDirectory>javadocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/apache-${project.artifactId}-${project.version}-standalone/lib</directory>
+ <directory>target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone/lib</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>
</fileSets>