You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/12/21 22:58:26 UTC
[1/7] incubator-slider git commit: SLIDER-1014 release 0.90.x: bump
up snapshot version to 0.90.2-SNAPSHOT. This will isolate staging uploads
better
Repository: incubator-slider
Updated Branches:
refs/heads/branches/branch-0.9 1c1ebad67 -> 145832079
SLIDER-1014 release 0.90.x: bump up snapshot version to 0.90.2-SNAPSHOT. This will isolate staging uploads better
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e6415a21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e6415a21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e6415a21
Branch: refs/heads/branches/branch-0.9
Commit: e6415a21133221183ce82aabbe38cb787adfce7f
Parents: 1c1ebad
Author: Steve Loughran <st...@hortonworks.com>
Authored: Fri Dec 18 18:23:05 2015 +0000
Committer: Steve Loughran <st...@hortonworks.com>
Committed: Fri Dec 18 18:23:05 2015 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
app-packages/command-logger/application-pkg/pom.xml | 2 +-
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/pom.xml | 2 +-
app-packages/pom.xml | 2 +-
app-packages/storm-win/pom.xml | 2 +-
app-packages/storm/pom.xml | 2 +-
pom.xml | 2 +-
slider-agent/pom.xml | 2 +-
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 2 +-
slider-funtest/pom.xml | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index 8744741..a1b0f95 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/app-packages/command-logger/application-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index 82a4c81..499fc3e 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/app-packages/command-logger/slider-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index 0699a80..267b98b 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index 424b2c2..e1cdac1 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 4d1cea0..399ab27 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index f32e71c..cfdda7a 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index d8219db..9de0bda 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 75e918a..1dad62e 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 351ac0c..3c8634a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<name>Slider</name>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index 009a864..ad69fd3 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index 0f7340f..b9d828c 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index c7e8933..b4c2257 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6415a21/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 2d0ac58..13621fc 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.0-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating-SNAPSHOT</version>
</parent>
<properties>
<work.dir>package-tmp</work.dir>
[4/7] incubator-slider git commit: SLIDER-1014 pom versions ->
0.90.2-incubating
Posted by st...@apache.org.
SLIDER-1014 pom versions -> 0.90.2-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1d40cc58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1d40cc58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1d40cc58
Branch: refs/heads/branches/branch-0.9
Commit: 1d40cc58638c88e4c8d50a3b4ddca2ce3a360678
Parents: 6f783dc
Author: Steve Loughran <st...@apache.org>
Authored: Sat Dec 19 19:29:19 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Dec 19 19:29:19 2015 +0000
----------------------------------------------------------------------
app-packages/accumulo/pom.xml | 2 +-
app-packages/command-logger/application-pkg/pom.xml | 2 +-
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase-win/pom.xml | 2 +-
app-packages/hbase/pom.xml | 2 +-
app-packages/pom.xml | 2 +-
app-packages/storm-win/pom.xml | 2 +-
app-packages/storm/pom.xml | 2 +-
pom.xml | 2 +-
slider-agent/pom.xml | 2 +-
slider-assembly/pom.xml | 2 +-
slider-core/pom.xml | 2 +-
slider-funtest/pom.xml | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/app-packages/accumulo/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/accumulo/pom.xml b/app-packages/accumulo/pom.xml
index a1b0f95..fd43679 100644
--- a/app-packages/accumulo/pom.xml
+++ b/app-packages/accumulo/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/app-packages/command-logger/application-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/application-pkg/pom.xml b/app-packages/command-logger/application-pkg/pom.xml
index 499fc3e..6878333 100644
--- a/app-packages/command-logger/application-pkg/pom.xml
+++ b/app-packages/command-logger/application-pkg/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/app-packages/command-logger/slider-pkg/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/command-logger/slider-pkg/pom.xml b/app-packages/command-logger/slider-pkg/pom.xml
index 267b98b..4fe8378 100644
--- a/app-packages/command-logger/slider-pkg/pom.xml
+++ b/app-packages/command-logger/slider-pkg/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/app-packages/hbase-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase-win/pom.xml b/app-packages/hbase-win/pom.xml
index e1cdac1..3294e30 100644
--- a/app-packages/hbase-win/pom.xml
+++ b/app-packages/hbase-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/app-packages/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/hbase/pom.xml b/app-packages/hbase/pom.xml
index 399ab27..e2a8980 100644
--- a/app-packages/hbase/pom.xml
+++ b/app-packages/hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/app-packages/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/pom.xml b/app-packages/pom.xml
index cfdda7a..8fbc17e 100644
--- a/app-packages/pom.xml
+++ b/app-packages/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/app-packages/storm-win/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm-win/pom.xml b/app-packages/storm-win/pom.xml
index 9de0bda..f393b0f 100644
--- a/app-packages/storm-win/pom.xml
+++ b/app-packages/storm-win/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/app-packages/storm/pom.xml
----------------------------------------------------------------------
diff --git a/app-packages/storm/pom.xml b/app-packages/storm/pom.xml
index 1dad62e..986f175 100644
--- a/app-packages/storm/pom.xml
+++ b/app-packages/storm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.slider.packages</groupId>
<artifactId>slider-app-packages</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3c8634a..56123a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
<name>Slider</name>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
<packaging>pom</packaging>
<description>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/slider-agent/pom.xml
----------------------------------------------------------------------
diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml
index ad69fd3..857d7a6 100644
--- a/slider-agent/pom.xml
+++ b/slider-agent/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>slider-agent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/slider-assembly/pom.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/pom.xml b/slider-assembly/pom.xml
index b9d828c..985083b 100644
--- a/slider-assembly/pom.xml
+++ b/slider-assembly/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index b4c2257..8902b26 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
</parent>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1d40cc58/slider-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/slider-funtest/pom.xml b/slider-funtest/pom.xml
index 13621fc..ef1ad11 100644
--- a/slider-funtest/pom.xml
+++ b/slider-funtest/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.slider</groupId>
<artifactId>slider</artifactId>
- <version>0.90.2-incubating-SNAPSHOT</version>
+ <version>0.90.2-incubating</version>
</parent>
<properties>
<work.dir>package-tmp</work.dir>
[7/7] incubator-slider git commit: SLIDER-1014 adding targets to
deploy to ASF staging, publish via apache dist svn repo
Posted by st...@apache.org.
SLIDER-1014 adding targets to deploy to ASF staging, publish via apache dist svn repo
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/14583207
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/14583207
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/14583207
Branch: refs/heads/branches/branch-0.9
Commit: 14583207959bac3e8a9a5d7b1fb5f743db946611
Parents: 0f27d6c
Author: Steve Loughran <st...@apache.org>
Authored: Mon Dec 21 18:14:58 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Dec 21 21:58:00 2015 +0000
----------------------------------------------------------------------
bin/release.xml | 306 +++++++++++++++++++++++++++++++++++++++++++--------
pom.xml | 14 ++-
2 files changed, 269 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14583207/bin/release.xml
----------------------------------------------------------------------
diff --git a/bin/release.xml b/bin/release.xml
index ec9bc84..59e1399 100644
--- a/bin/release.xml
+++ b/bin/release.xml
@@ -35,11 +35,16 @@
slider.develop.version=0.92-SNAPSHOT
release.jira=SLIDER-1014
+ # needed for announcements
+ release.jira.page
+ staging.repository
+
#optional
mvn.extra.args
slider.conf.dir: value of SLIDER_CONF_DIR for integration tests
upload.user: username for asf uploads. Default: current username
upload.disabled: set property to disable uploads to asf infra
+
</description>
<target name="init">
@@ -58,6 +63,77 @@
</sequential>
</macrodef>
+ <require property="slider.release.version" />
+ <require property="slider.develop.version" />
+ <require property="release.jira" />
+ <property name="release.rc.suffix" value="" />
+
+ <property name="mvn.skiptests" value="-DskipTests" />
+ <property name="mvn.profile" value=" -Papache-release" />
+ <property name="mvn.extra.args" value="" />
+
+ <property name="release.name" value="slider-${slider.release.version}" />
+ <property name="asf.user" value="${user.name}" />
+ <property name="upload.keyfile" location="${user.home}/.ssh/id_dsa" />
+ <property name="expanded.tar" location="slider-assembly/target/${release.name}-all/" />
+ <property name="source.archive.name" value="apache-${release.name}-source-release" />
+ <property name="slider.source.tar.gz"
+ location="target/${source.archive.name}.tar.gz" />
+ <property name="slider.source.zip"
+ location="target/${source.archive.name}.zip" />
+ <property name="application.dir" location="${expanded.tar}/${release.name}/" />
+
+ <!-- <property name="upload.host" value="home.apache.org" />-->
+ <property name="upload.basedir" value="public_html" />
+ <property name="upload.trust" value="false" />
+ <property name="rc.name" value="${release.name}${release.rc.suffix}" />
+ <property name="upload.subdir" value="${rc.name}" />
+ <property name="upload.dest" value="${upload.basedir}/${upload.subdir}" />
+ <property name="t_upload_base" location="target/${upload.basedir}" />
+ <property name="t_upload_dest" location="${t_upload_base}/${upload.subdir}" />
+ <property name="slider.vote.file" location="target/vote.txt" />
+ <property name="nexus.staging.repository" value="(unset nexus.staging.repository)" />
+ <property name="nexus.base.url" value="https://repository.apache.org/content/repositories/" />
+ <property name="nexus.staging.url" value="${nexus.base.url}${nexus.staging.repository}/" />
+ <property name="incubator.svn.url"
+ value="https://dist.apache.org/repos/dist/release/incubator" />
+ <property name="svn.release.dir" value="${svn.publish.dir}/${rc.name}" />
+ <property name="svn.release.url" value="${incubator.svn.url}/slider/${rc.name}" />
+ <property name="svn.release.source.tar.gz" value="${svn.release.url}/slider/${rc.name}" />
+ <property name="pgp.url"
+ value="http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=${asf.user}@apache.org"/>
+ <property name="git.base.url"
+ value="https://git-wip-us.apache.org/repos/asf?p=incubator-slider.git" />
+
+
+ <!--
+ <property name="svn.publish.dir" location="" />
+ -->
+ <property name="svn.commit.message"
+ location="[${release.jira}] Publish ${release.name}${release.rc.suffix} " />
+
+
+ <echo>
+ Releasing Apache Slider (incubating)
+ ====================================
+
+ slider.release.version: ${slider.release.version}
+ slider.develop.version: ${slider.develop.version}
+ release.jira: ${release.jira}
+ slider.conf.dir: ${slider.conf.dir}
+
+ svn publishing
+ --------------
+ svn.publish.dir: ${slider.publish.dir}
+ svn.commit.message: ${svn.commit.message}
+ svn
+
+ ------
+ upload.host: ${upload.host}
+ asf.user: ${asf.user}
+ </echo>
+
+
<macrodef name="must-be-zero">
<attribute name="value" />
<attribute name="text" default="" />
@@ -88,15 +164,6 @@
</sequential>
</macrodef>
- <require property="slider.release.version" />
- <require property="slider.develop.version" />
- <require property="release.jira" />
- <property name="release.rc.suffix" value =""/>
-
- <property name="mvn.skiptests" value="-DskipTests" />
- <property name="mvn.profile" value=" -Papache-release" />
- <property name="mvn.extra.args" value="" />
-
<!-- template exec with the failonerror flag set-->
<presetdef name="ex">
<exec failonerror="true">
@@ -154,6 +221,10 @@
</sequential>
</macrodef>
+ <presetdef name="svn">
+ <ex executable="svn" />
+ </presetdef>
+
<macrodef name="gpg2">
<attribute name="command"/>
<sequential>
@@ -164,36 +235,31 @@
</sequential>
</macrodef>
-
- <property name="release.name" value="slider-${slider.release.version}" />
- <property name="upload.user" value="${user.name}" />
- <property name="upload.keyfile" location="${user.home}/.ssh/id_dsa" />
- <property name="expanded.tar" location="slider-assembly/target/${release.name}-all/" />
- <property name="source.archive.name" value="apache-${release.name}-source-release" />
- <property name="slider.source.tar.gz"
- location="target/${source.archive.name}.tar.gz" />
- <property name="slider.source.zip"
- location="target/${source.archive.name}.zip" />
- <property name="application.dir" location="${expanded.tar}/${release.name}/" />
-
- <property name="upload.host" value="home.apache.org" />
- <property name="upload.basedir" value="public_html" />
- <property name="upload.trust" value="false" />
- <property name="upload.dir" value="${release.name}${release.rc.suffix}" />
- <property name="upload.dest" value="${upload.basedir}/${upload.dir}" />
- <property name="t_upload_base" location="target/${upload.basedir}" />
- <property name="t_upload_dest" location="${t_upload_base}/${upload.dir}" />
- <echo>
- Releasing Apache Slider (incubating)
- ====================================
-
- slider.release.version: ${slider.release.version}
- slider.develop.version: ${slider.develop.version}
- release.jira: ${release.jira}
- slider.conf.dir: ${slider.conf.dir}
- upload.user: ${upload.user}
- </echo>
-
+ <!-- lifted straight from Ant's manual -->
+ <macrodef name="get-and-checksum">
+ <attribute name="url" />
+ <attribute name="dest" />
+ <sequential>
+ <local name="destdir" />
+ <dirname property="destdir" file="@{dest}" />
+ <get dest="${destdir}">
+ <url url="@{url}" />
+ <url url="@{url}.sha1" />
+ <firstmatchmapper>
+ <globmapper from="@{url}.sha1" to="@{dest}.sha" />
+ <globmapper from="@{url}" to="@{dest}" />
+ </firstmatchmapper>
+ </get>
+ <local name="checksum.matches" />
+ <local name="checksum.matches.fail" />
+ <checksum file="@{dest}" algorithm="sha" fileext=".sha"
+ verifyproperty="checksum.matches" />
+ <condition property="checksum.matches.fail">
+ <equals arg1="${checksum.matches}" arg2="false" />
+ </condition>
+ <fail if="checksum.matches.fail">Checksum error</fail>
+ </sequential>
+ </macrodef>
</target>
@@ -223,11 +289,15 @@
<must-be-zero value="${rat.result}" text="${rat.txt}"/>
</target>
+ <target name="deploy" depends="init">
+ <mvn command="deploy"/>
+ </target>
+
<target name="package" depends="init">
<mvn command="site:site package"/>
</target>
- <target name="stage" depends="init">
+ <target name="mvnstage" depends="init">
<mvn command="site:stage"/>
</target>
@@ -260,7 +330,11 @@
</checksum>
</target>
- <target name="tarball" depends="clean, rat, package, validate-packaging, checksums" />
+ <!-- tarball operations; no actual build/package of binaries-->
+ <target name="tarball-no-package" depends="validate-packaging, checksums" />
+
+ <!-- tarball with packaging. This doesn't stage-->
+ <target name="tarball" depends="clean, rat, package, tarball-no-package" />
<target name="clean-target-dir" depends="init">
<delete>
@@ -280,7 +354,7 @@
/>
</target>
- <target name="prepare-upload-rc" depends="validate-packaging" >
+ <target name="prepare-rc" depends="validate-packaging" >
<delete dir="${t_upload_base}" />
<mkdir dir="${t_upload_dest}/" />
@@ -290,18 +364,160 @@
<ex command="ls"><arg line="-al ${t_upload_dest}"/></ex>
</target>
- <target name="upload" depends="init" unless="upload.disabled">
+ <!--
+ upload to a host via SFTP; here to support RC publishing by copying to
+ people.apache.org or home.apache.org and then voting
+ -->
+ <target name="upload" depends="init"
+ description="upload to the host defined by upload.host">
<must-exist file="${upload.keyfile}" />
- <scp remoteTodir="${upload.user}@${upload.host}:${upload.basedir}"
+ <scp remoteTodir="${asf.user}@${upload.host}:${upload.basedir}"
keyfile="${upload.keyfile}"
sftp="true"
trust="${upload.trust}"
verbose="true">
<fileset dir="${t_upload_base}" includes="**/*" />
-
</scp>
+ </target>
+
+ <target name="git-version" depends="init">
+ <ex executable="git" outputproperty="git.version">
+ <arg line="show-ref HEAD --head --hash" />
+ </ex>
+ <echo>git.version=${git.version}</echo>
+ <property name="git.release.url"
+ value="${git.base.url};a=commit;h=${git.version}" />
+ </target>
+
+ <target name="svn-setup" depends="init">
+ <require property="svn.publish.dir" />
+ <must-exist file="${svn.publish.dir}" text="svn.publish.dir" />
+ </target>
+
+ <target name="copy-to-svn" depends="svn-setup"
+ description="copy the artifacts to the svn-managed directory">
+ <delete dir="${svn.release.dir}" />
+ <mkdir dir="${svn.release.dir}" />
+ <copy todir="${svn.release.dir}" >
+ <fileset dir="${t_upload_dest}" includes="**/*" />
+ </copy>
+ <ex command="ls">
+ <arg line="-al ${svn.release.dir}" />
+ </ex>
+ </target>
+
+ <target name="commit-svn" depends="svn-setup"
+ description="commit the SVN repo. This publishes the source artifacts">
+ <svn>
+ <arg value="commit"/>
+ <arg value="-m"/>
+ <arg value="${svn.commit.message}"/>
+ <arg location="${svn.release.dir}" />
+ </svn>
+ </target>
+ <target name="publish-via-svn" depends="copy-to-svn, commit-svn" />
+
+ <target name="release-no-commit"
+ depends="clean, rat, deploy, tarball-no-package, commit-svn, publish-via-svn">
+ <echo>Artifacts staged on mvn repo</echo>
+ </target>
+
+ <target name="release"
+ depends="release-no-commit, publish-via-svn, print-nexus-instructions">
+ <echo>Artifacts staged on mvn repo</echo>
+ </target>
+
+
+ <target name="check-base-urls" depends="init"
+ description="check the base URLs which can be validated independent of release values">
+ <property name="get.dir" location="target/get" />
+ <delete dir="${get.dir}" />
+ <mkdir dir="${get.dir}" />
+ <get dest="${get.dir}" verbose="true">
+ <url url="${git.base.url}" />
+ <url url="${incubator.svn.url}/" />
+ <url url="${incubator.svn.url}/slider/" />
+ <url url="${pgp.url}" />
+ <url url="${nexus.base.url}" />
+ </get>
+ </target>
+
+ <target name="check-release-urls" depends="check-base-urls,git-version"
+ description="check the final release URLs and artifacts">
+ <get dest="${get.dir}" verbose="true">
+ <url url="${git.release.url}" />
+ <url url="${nexus.staging.url}" />
+ <url url="${svn.release.url}" />
+ </get>
+ </target>
+
+ <target name="print-nexus-instructions" depends="init" >
+ <echo >
+ The artifacts are now on the Apache Repository staging server.
+ ==============================================================
+
+ 1. Log in to https://repository.apache.org/index.html
+ with your ASF username and LDAP password
+ 2. Go to "Staging Repositories"
+ https://repository.apache.org/index.html#stagingRepositories)
+ 3. Search for the `orgapacheslider` repository with the highest number
+ 4. Select it
+ 5. Browse the content, verify the version number is what you want.
+ 6. Hit the "close" button (top of list).
+ This will fail if it doesn't meet the ASF criteria
+ 7. Wait for the close process to complete.
+ 8. Get the name of the closed staging repository (e.g. orgapacheslider-1010)
+ set the property nexus.staging.repository to his value
+ 9. Execute:
+ ant -f bin/release.xml generate-vote-text
+ </echo>
</target>
+ <target name="echo-vote-text" depends="init, git-version">
+ <require property="release.jira.page"/>
+ <!-- -->
+ <echo file="${slider.vote.file}">
+[VOTE] Apache Slider (incubating) release ${release.name}
+
+Hello,
+
+This is a call for a vote on the Apache Slider (incubating) release ${release.name}
+
+
+Issues fixed:
+${release.jira.page}
+
+Source artifacts:
+${svn.release.url}
+
+Staged artifacts:
+${nexus.staging.url}
+
+Git source:
+${git.release.url}
+SHA1: ${git.version}
+
+PGP key:
+http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=${asf.user}@apache.org
+
+
+[ ] +1 Release Apache Slider (incubating) ${release.name}
+[ ] 0
+[ ] -1 Do not release Apache Slider (incubating) ${release.name}
+
+Voting lasts 72h,
+
+ </echo>
+ <loadfile property="slider.vote.text" srcfile="${slider.vote.file}" />
+ <echo>
+Voting text is in ${slider.vote.file}
+
+${slider.vote.text}
+ </echo>
+ </target>
+ <target name="generate-vote-text" depends="check-release-urls, echo-vote-text"
+ description="generate the vote text -after validating its links"
+ />
</project>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14583207/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 56123a6..4e2e7b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,12 +307,6 @@
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<inherited>true</inherited>
- <configuration>
- <!-- skip test resource configuration-->
- <excludes>
- <exclude>**/slider-test.xml</exclude>
- </excludes>
- </configuration>
<executions>
<execution>
<id>attach-sources</id>
@@ -323,6 +317,14 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <excludes>
+ <!-- skip test resource configuration-->
+ <exclude>**/slider-test.xml</exclude>
+ <exclude>**/build.properties</exclude>
+ <exclude>**/*~</exclude>
+ </excludes>
+ </configuration>
</plugin>
<plugin>
[3/7] incubator-slider git commit: SLIDER-1014 targets to set release
versions
Posted by st...@apache.org.
SLIDER-1014 targets to set release versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6f783dca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6f783dca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6f783dca
Branch: refs/heads/branches/branch-0.9
Commit: 6f783dca00f7ecd097bef08355ce73241e4a8039
Parents: 88011ee
Author: Steve Loughran <st...@apache.org>
Authored: Sat Dec 19 19:09:51 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Dec 19 19:09:51 2015 +0000
----------------------------------------------------------------------
bin/release.xml | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6f783dca/bin/release.xml
----------------------------------------------------------------------
diff --git a/bin/release.xml b/bin/release.xml
index 568dc6a..8e7b1ee 100644
--- a/bin/release.xml
+++ b/bin/release.xml
@@ -32,7 +32,7 @@
properties to set in build.xml or on the CLI
slider.release.version=0.91.0
- slider.updated.version=0.92-SNAPSHOT
+ slider.develop.version=0.92-SNAPSHOT
slider.jira=SLIDER-1014
#optional
@@ -88,7 +88,7 @@
</macrodef>
<require property="slider.release.version" />
- <require property="slider.updated.version" />
+ <require property="slider.develop.version" />
<require property="slider.jira" />
<property name="mvn.extra.args" value="" />
@@ -124,9 +124,8 @@
<attribute name="version" />
<sequential>
<mvn command="versions:set -DnewVersion=@{version}" />
- <delete includes="**/*.pom.xml.versionsBackup" />
+ <delete dir="." includes="**/*.pom.xml.versionsBackup" />
</sequential>
-
</macrodef>
<!-- Run a git command-->
@@ -140,6 +139,14 @@
</sequential>
</macrodef>
+ <echo>
+ Releasing Apache Slider (incubating)
+ ====================================
+
+ slider.release.version=${slider.release.version}
+ slider.develop.version=${slider.develop.version}
+ slider.jira=${slider.jira}
+ </echo>
</target>
<target name="clean" depends="init">
@@ -167,4 +174,10 @@
description="Set the POM version to slider.release.version ">
<mvn-setversion version="${slider.release.version}" />
</target>
+
+ <target name="set-to-develop-version" depends="init"
+ description="Set the POM version to slider.develop.version ">
+ <mvn-setversion version="${slider.develop.version}" />
+ </target>
+
</project>
[2/7] incubator-slider git commit: SLIDER-1014 automating the release
process
Posted by st...@apache.org.
SLIDER-1014 automating the release process
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/88011ee8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/88011ee8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/88011ee8
Branch: refs/heads/branches/branch-0.9
Commit: 88011ee8f6bbf04f0d1af17cd0f3666b83ac0533
Parents: e6415a2
Author: Steve Loughran <st...@apache.org>
Authored: Sat Dec 19 19:05:22 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Dec 19 19:05:22 2015 +0000
----------------------------------------------------------------------
bin/release.xml | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 170 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/88011ee8/bin/release.xml
----------------------------------------------------------------------
diff --git a/bin/release.xml b/bin/release.xml
new file mode 100644
index 0000000..568dc6a
--- /dev/null
+++ b/bin/release.xml
@@ -0,0 +1,170 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="release" basedir="..">
+
+ <description>
+ This an Ant build file to automate the release process of
+ Apache Slider (incubating).
+
+ It wraps the core maven build and package commands with the
+ operations needed to actually publish the artifacts, generate
+ email announcements, etc.
+
+ Requirements
+ -all the various build tools are installed and on the path
+ -you have git installed
+
+ properties to set in build.xml or on the CLI
+
+ slider.release.version=0.91.0
+ slider.updated.version=0.92-SNAPSHOT
+ slider.jira=SLIDER-1014
+
+ #optional
+ mvn.extra.args
+ </description>
+
+ <target name="init">
+ <property file="build.properties"/>
+ <!-- Create the time stamp -->
+ <tstamp/>
+ <!-- Create the build directory structure used by compile -->
+ <mkdir dir="${build}"/>
+
+ <macrodef name="require">
+ <attribute name="property" />
+ <attribute name="text" default="" />
+ <sequential>
+ <fail unless="@{property}">
+ @{text}
+ Unset property: @{property}
+ </fail>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="must-be-zero">
+ <attribute name="value" />
+ <attribute name="text" default="" />
+ <sequential>
+ <fail>
+ <condition>
+ <not>
+ <equals arg1="0" arg2="@{value}" />
+ </not>
+ </condition>
+ @{text}
+ "@{value}" != 0
+ </fail>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="must-exist">
+ <attribute name="file" />
+ <attribute name="text" default=""/>
+ <sequential>
+ <fail>
+ <condition>
+ <not><available file="@{file}"/></not>
+ </condition>
+ @{text}
+ File not found: @{name}
+ </fail>
+ </sequential>
+ </macrodef>
+
+ <require property="slider.release.version" />
+ <require property="slider.updated.version" />
+ <require property="slider.jira" />
+
+ <property name="mvn.extra.args" value="" />
+
+ <!-- maven command. the value of ${mvn.extra.args} is appended-->
+ <macrodef name="mvn">
+ <attribute name="command"/>
+ <sequential>
+ <echo>maven : @{command}</echo>
+ <exec executable="mvn" failonerror="true">
+ <arg line="@{command} ${mvn.extra.args}"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
+ <!--
+ run maven and don't fail even if it does. Instead the property "property"
+ is set to the return code
+ -->
+ <macrodef name="mvn-nofail">
+ <attribute name="command" />
+ <attribute name="property"/>
+ <sequential>
+ <echo>maven : @{command}</echo>
+ <exec executable="mvn" failonerror="false" resultproperty="@{property}">
+ <arg line="@{command} ${mvn.extra.args}" />
+ </exec>
+ </sequential>
+ </macrodef>
+
+ <!-- set the poms to a new version -->
+ <macrodef name="mvn-setversion">
+ <attribute name="version" />
+ <sequential>
+ <mvn command="versions:set -DnewVersion=@{version}" />
+ <delete includes="**/*.pom.xml.versionsBackup" />
+ </sequential>
+
+ </macrodef>
+
+ <!-- Run a git command-->
+ <macrodef name="git">
+ <attribute name="command"/>
+ <sequential>
+ <echo>git @command</echo>
+ <exec executable="git" failonerror="true">
+ <arg line="@{command}"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
+ </target>
+
+ <target name="clean" depends="init">
+ <mvn command="clean -Pall-modules"/>
+ </target>
+
+
+ <target name="build" depends="init, rat">
+ <mvn command="clean install -DskipTests"/>
+ </target>
+
+ <target name="rat" depends="clean"
+ description="Execute the RAT scan, print the results and fail if there is a problem">
+ <mvn-nofail command="apache-rat:check -Prat -Papache-release" property="rat.result"/>
+ <loadfile property="rat.txt" srcfile="target/rat.txt" />
+ <echo> return code =${rat.result}</echo>
+ <must-be-zero value="${rat.result}" text="${rat.txt}"/>
+ </target>
+
+ <target name="package" depends="build">
+ <mvn command="site:site site:stage package -DskipTests"/>
+ </target>
+
+ <target name="set-to-release-version" depends="init"
+ description="Set the POM version to slider.release.version ">
+ <mvn-setversion version="${slider.release.version}" />
+ </target>
+</project>
[5/7] incubator-slider git commit: SLIDER-1014 packaging,
validation and checksumming. TODO: uploads
Posted by st...@apache.org.
SLIDER-1014 packaging, validation and checksumming. TODO: uploads
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/12bfee53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/12bfee53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/12bfee53
Branch: refs/heads/branches/branch-0.9
Commit: 12bfee53416ed98b27e405e6fa8316a8bb93bdc6
Parents: 1d40cc5
Author: Steve Loughran <st...@apache.org>
Authored: Sat Dec 19 20:37:47 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sat Dec 19 20:37:47 2015 +0000
----------------------------------------------------------------------
bin/release.xml | 97 +++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 84 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/12bfee53/bin/release.xml
----------------------------------------------------------------------
diff --git a/bin/release.xml b/bin/release.xml
index 8e7b1ee..090130b 100644
--- a/bin/release.xml
+++ b/bin/release.xml
@@ -37,6 +37,7 @@
#optional
mvn.extra.args
+ slider.conf.dir value of SLIDER_CONF_DIR for integration tests
</description>
<target name="init">
@@ -82,7 +83,7 @@
<not><available file="@{file}"/></not>
</condition>
@{text}
- File not found: @{name}
+ File not found: @{file}
</fail>
</sequential>
</macrodef>
@@ -91,15 +92,19 @@
<require property="slider.develop.version" />
<require property="slider.jira" />
+ <property name="mvn.skiptests" value="-DskipTests" />
+ <property name="mvn.profile" value=" -Papache-release" />
<property name="mvn.extra.args" value="" />
<!-- maven command. the value of ${mvn.extra.args} is appended-->
<macrodef name="mvn">
<attribute name="command"/>
+ <attribute name="tests" default="${mvn.skiptests}" />
+ <attribute name="profile" default="${mvn.profile}" />
<sequential>
<echo>maven : @{command}</echo>
<exec executable="mvn" failonerror="true">
- <arg line="@{command} ${mvn.extra.args}"/>
+ <arg line="@{command} @{tests} @{profile} ${mvn.extra.args}"/>
</exec>
</sequential>
</macrodef>
@@ -111,10 +116,12 @@
<macrodef name="mvn-nofail">
<attribute name="command" />
<attribute name="property"/>
+ <attribute name="tests" default="${mvn.skiptests}"/>
+ <attribute name="profile" default="${mvn.profile}"/>
<sequential>
<echo>maven : @{command}</echo>
<exec executable="mvn" failonerror="false" resultproperty="@{property}">
- <arg line="@{command} ${mvn.extra.args}" />
+ <arg line="@{command} @{tests} @{profile} ${mvn.extra.args}" />
</exec>
</sequential>
</macrodef>
@@ -124,21 +131,41 @@
<attribute name="version" />
<sequential>
<mvn command="versions:set -DnewVersion=@{version}" />
- <delete dir="." includes="**/*.pom.xml.versionsBackup" />
+ <delete dir="." includes="**/pom.xml.versionsBackup" />
</sequential>
</macrodef>
+
<!-- Run a git command-->
<macrodef name="git">
<attribute name="command"/>
<sequential>
- <echo>git @command</echo>
+ <echo>git @{command}</echo>
<exec executable="git" failonerror="true">
<arg line="@{command}"/>
</exec>
</sequential>
</macrodef>
+ <macrodef name="gpg2">
+ <attribute name="command"/>
+ <sequential>
+ <echo>gpg2 @{command}</echo>
+ <exec executable="gpg2" failonerror="true">
+ <arg line="@{command}"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
+
+ <property name="release.name" value="slider-${slider.release.version}" />
+ <property name="expanded.tar" location="slider-assembly/target/${release.name}-all/" />
+ <property name="slider.source.tar.gz"
+ location="target/apache-${release.name}-source-release.tar.gz" />
+ <property name="slider.source.zip"
+ location="target/apache-${release.name}-source-release.zip" />
+ <property name="application.dir" location="${expanded.tar}/${release.name}/" />
+
<echo>
Releasing Apache Slider (incubating)
====================================
@@ -146,28 +173,44 @@
slider.release.version=${slider.release.version}
slider.develop.version=${slider.develop.version}
slider.jira=${slider.jira}
+ slider.conf.dir = ${slider.conf.dir}
</echo>
+
+
</target>
- <target name="clean" depends="init">
- <mvn command="clean -Pall-modules"/>
+ <target name="clean" depends="init">
+ <mvn command="clean -Pall-modules" />
</target>
+ <target name="install" depends="init, rat">
+ <mvn command="install" />
+ </target>
+
+ <target name="test" depends="init">
+ <mvn command="test" />
+ </target>
- <target name="build" depends="init, rat">
- <mvn command="clean install -DskipTests"/>
+ <target name="integration-test" depends="init">
+ <require property="slider.conf.dir" />
+ <must-exist file="${slider.conf.dir}" />
+ <mvn command="integration-test -Dslider.conf.dir=${slider.conf.dir} " />
</target>
- <target name="rat" depends="clean"
+ <target name="rat" depends="init, clean"
description="Execute the RAT scan, print the results and fail if there is a problem">
- <mvn-nofail command="apache-rat:check -Prat -Papache-release" property="rat.result"/>
+ <mvn-nofail command="apache-rat:check -Prat" property="rat.result"/>
<loadfile property="rat.txt" srcfile="target/rat.txt" />
<echo> return code =${rat.result}</echo>
<must-be-zero value="${rat.result}" text="${rat.txt}"/>
</target>
- <target name="package" depends="build">
- <mvn command="site:site site:stage package -DskipTests"/>
+ <target name="package" depends="install">
+ <mvn command="site:site package"/>
+ </target>
+
+ <target name="stage" depends="install">
+ <mvn command="site:stage"/>
</target>
<target name="set-to-release-version" depends="init"
@@ -180,4 +223,32 @@
<mvn-setversion version="${slider.develop.version}" />
</target>
+ <target name="validate-packaging" depends="init">
+ <must-exist file="${expanded.tar}"/>
+ <must-exist file="${application.dir}"/>
+ <must-exist file="${application.dir}/lib/slider-agent.tar.gz"/>
+ <must-exist file="${slider.source.tar.gz}"/>
+ <must-exist file="${slider.source.zip}"/>
+ </target>
+
+ <target name="checksums" depends="validate-packaging">
+ <checksum algorithm="md5" forceoverwrite="true" >
+ <fileset file="${slider.source.tar.gz}" />
+ <fileset file="${slider.source.zip}" />
+ </checksum>
+ <checksum algorithm="sha1" forceoverwrite="true">
+ <fileset file="${slider.source.tar.gz}" />
+ <fileset file="${slider.source.zip}" />
+ </checksum>
+ </target>
+
+ <target name="tarball" depends="clean, rat, package, validate-packaging" />
+
+ <target name="clean-target-dir" depends="init">
+ <delete>
+ <fileset dir="target"
+ includes="rat.txt,.plxarc,archive-tmp,maven-shared-archive-resources"/>
+ </delete>
+ </target>
+
</project>
[6/7] incubator-slider git commit: adding support for SFTP up to a
destination server. This works for publishing to local servers,
but not to the ASF one as there's no compatible key exchange protocol. Chasing
up with infra
Posted by st...@apache.org.
adding support for SFTP up to a destination server. This works for publishing to local servers, but not to the ASF one as there's no compatible key exchange protocol. Chasing up with infra
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0f27d6c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0f27d6c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0f27d6c1
Branch: refs/heads/branches/branch-0.9
Commit: 0f27d6c1562793c85b2b7d49fcee7f4ac796c622
Parents: 12bfee5
Author: Steve Loughran <st...@apache.org>
Authored: Sun Dec 20 18:21:01 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Sun Dec 20 18:21:01 2015 +0000
----------------------------------------------------------------------
bin/release.xml | 93 +++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 73 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0f27d6c1/bin/release.xml
----------------------------------------------------------------------
diff --git a/bin/release.xml b/bin/release.xml
index 090130b..ec9bc84 100644
--- a/bin/release.xml
+++ b/bin/release.xml
@@ -33,19 +33,19 @@
slider.release.version=0.91.0
slider.develop.version=0.92-SNAPSHOT
- slider.jira=SLIDER-1014
+ release.jira=SLIDER-1014
#optional
mvn.extra.args
- slider.conf.dir value of SLIDER_CONF_DIR for integration tests
+ slider.conf.dir: value of SLIDER_CONF_DIR for integration tests
+ upload.user: username for asf uploads. Default: current username
+ upload.disabled: set property to disable uploads to asf infra
</description>
<target name="init">
<property file="build.properties"/>
<!-- Create the time stamp -->
<tstamp/>
- <!-- Create the build directory structure used by compile -->
- <mkdir dir="${build}"/>
<macrodef name="require">
<attribute name="property" />
@@ -90,12 +90,19 @@
<require property="slider.release.version" />
<require property="slider.develop.version" />
- <require property="slider.jira" />
+ <require property="release.jira" />
+ <property name="release.rc.suffix" value =""/>
<property name="mvn.skiptests" value="-DskipTests" />
<property name="mvn.profile" value=" -Papache-release" />
<property name="mvn.extra.args" value="" />
+ <!-- template exec with the failonerror flag set-->
+ <presetdef name="ex">
+ <exec failonerror="true">
+ </exec>
+ </presetdef>
+
<!-- maven command. the value of ${mvn.extra.args} is appended-->
<macrodef name="mvn">
<attribute name="command"/>
@@ -103,9 +110,9 @@
<attribute name="profile" default="${mvn.profile}" />
<sequential>
<echo>maven : @{command}</echo>
- <exec executable="mvn" failonerror="true">
+ <ex executable="mvn" >
<arg line="@{command} @{tests} @{profile} ${mvn.extra.args}"/>
- </exec>
+ </ex>
</sequential>
</macrodef>
@@ -141,9 +148,9 @@
<attribute name="command"/>
<sequential>
<echo>git @{command}</echo>
- <exec executable="git" failonerror="true">
+ <ex executable="git" >
<arg line="@{command}"/>
- </exec>
+ </ex>
</sequential>
</macrodef>
@@ -151,29 +158,40 @@
<attribute name="command"/>
<sequential>
<echo>gpg2 @{command}</echo>
- <exec executable="gpg2" failonerror="true">
+ <ex executable="gpg2" >
<arg line="@{command}"/>
- </exec>
+ </ex>
</sequential>
</macrodef>
<property name="release.name" value="slider-${slider.release.version}" />
+ <property name="upload.user" value="${user.name}" />
+ <property name="upload.keyfile" location="${user.home}/.ssh/id_dsa" />
<property name="expanded.tar" location="slider-assembly/target/${release.name}-all/" />
+ <property name="source.archive.name" value="apache-${release.name}-source-release" />
<property name="slider.source.tar.gz"
- location="target/apache-${release.name}-source-release.tar.gz" />
+ location="target/${source.archive.name}.tar.gz" />
<property name="slider.source.zip"
- location="target/apache-${release.name}-source-release.zip" />
+ location="target/${source.archive.name}.zip" />
<property name="application.dir" location="${expanded.tar}/${release.name}/" />
+ <property name="upload.host" value="home.apache.org" />
+ <property name="upload.basedir" value="public_html" />
+ <property name="upload.trust" value="false" />
+ <property name="upload.dir" value="${release.name}${release.rc.suffix}" />
+ <property name="upload.dest" value="${upload.basedir}/${upload.dir}" />
+ <property name="t_upload_base" location="target/${upload.basedir}" />
+ <property name="t_upload_dest" location="${t_upload_base}/${upload.dir}" />
<echo>
Releasing Apache Slider (incubating)
====================================
- slider.release.version=${slider.release.version}
- slider.develop.version=${slider.develop.version}
- slider.jira=${slider.jira}
- slider.conf.dir = ${slider.conf.dir}
+ slider.release.version: ${slider.release.version}
+ slider.develop.version: ${slider.develop.version}
+ release.jira: ${release.jira}
+ slider.conf.dir: ${slider.conf.dir}
+ upload.user: ${upload.user}
</echo>
@@ -205,11 +223,11 @@
<must-be-zero value="${rat.result}" text="${rat.txt}"/>
</target>
- <target name="package" depends="install">
+ <target name="package" depends="init">
<mvn command="site:site package"/>
</target>
- <target name="stage" depends="install">
+ <target name="stage" depends="init">
<mvn command="site:stage"/>
</target>
@@ -242,7 +260,7 @@
</checksum>
</target>
- <target name="tarball" depends="clean, rat, package, validate-packaging" />
+ <target name="tarball" depends="clean, rat, package, validate-packaging, checksums" />
<target name="clean-target-dir" depends="init">
<delete>
@@ -251,4 +269,39 @@
</delete>
</target>
+ <target name="copy-tasklibs" depends="init"
+ description="copy int to the ant lib any needed jars -from the maven repo">
+ <property name="jsch.version" value="0.1.51" />
+ <property name="antlib.dir" location="${user.home}/.ant/lib" />
+ <property name="mvnrepo.dir" location="${user.home}/.m2/repository" />
+ <copy
+ file="${mvnrepo.dir}/com/jcraft/jsch/${jsch.version}/jsch-${jsch.version}.jar"
+ todir="${antlib.dir}"
+ />
+ </target>
+
+ <target name="prepare-upload-rc" depends="validate-packaging" >
+
+ <delete dir="${t_upload_base}" />
+ <mkdir dir="${t_upload_dest}/" />
+ <copy todir="${t_upload_dest}" >
+ <fileset dir="target" includes="${source.archive.name}.*/" />
+ </copy>
+ <ex command="ls"><arg line="-al ${t_upload_dest}"/></ex>
+ </target>
+
+ <target name="upload" depends="init" unless="upload.disabled">
+ <must-exist file="${upload.keyfile}" />
+ <scp remoteTodir="${upload.user}@${upload.host}:${upload.basedir}"
+ keyfile="${upload.keyfile}"
+ sftp="true"
+ trust="${upload.trust}"
+ verbose="true">
+ <fileset dir="${t_upload_base}" includes="**/*" />
+
+ </scp>
+
+ </target>
+
+
</project>