You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bahir.apache.org by lr...@apache.org on 2019/05/19 15:26:39 UTC
[bahir] branch branch-2.3 created (now bd237d7)
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a change to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/bahir.git.
at bd237d7 Update release script to support branches
This branch includes the following new commits:
new 940bfa4 Set Spark version to 2.3.3 preparing for release
new 868102b Prepare for next development iteration
new bd237d7 Update release script to support branches
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[bahir] 02/03: Prepare for next development iteration
Posted by lr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/bahir.git
commit 868102b2e9adbcc38acb730ecd27246395417af5
Author: Luciano Resende <lr...@apache.org>
AuthorDate: Sun May 19 17:13:38 2019 +0200
Prepare for next development iteration
---
distribution/pom.xml | 2 +-
pom.xml | 8 ++++----
sql-cloudant/pom.xml | 2 +-
sql-streaming-akka/pom.xml | 2 +-
sql-streaming-mqtt/pom.xml | 2 +-
streaming-akka/pom.xml | 2 +-
streaming-mqtt/pom.xml | 2 +-
streaming-pubnub/pom.xml | 2 +-
streaming-pubsub/pom.xml | 2 +-
streaming-twitter/pom.xml | 2 +-
streaming-zeromq/pom.xml | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index f382b67..4f70a72 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index cbb5f52..f7170c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
</parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Bahir - Parent POM</name>
<url>http://bahir.apache.org/</url>
@@ -38,9 +38,9 @@
</licenses>
<scm>
<connection>scm:git:git@github.com:apache/bahir.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/bahir.git</developerConnection>
- <url>scm:git:git@github.com:apache/bahir.git</url>
- <tag>v2.3.2-rc1</tag>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/bahir.git</developerConnection>
+ <url>https://github.com/apache/bahir</url>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
<system>JIRA</system>
diff --git a/sql-cloudant/pom.xml b/sql-cloudant/pom.xml
index 208039e..a338958 100644
--- a/sql-cloudant/pom.xml
+++ b/sql-cloudant/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sql-streaming-akka/pom.xml b/sql-streaming-akka/pom.xml
index 0692b87..9e4499c 100644
--- a/sql-streaming-akka/pom.xml
+++ b/sql-streaming-akka/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/sql-streaming-mqtt/pom.xml b/sql-streaming-mqtt/pom.xml
index 6cd5e63..58053fc 100644
--- a/sql-streaming-mqtt/pom.xml
+++ b/sql-streaming-mqtt/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/streaming-akka/pom.xml b/streaming-akka/pom.xml
index 632e905..51efcbc 100644
--- a/streaming-akka/pom.xml
+++ b/streaming-akka/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/streaming-mqtt/pom.xml b/streaming-mqtt/pom.xml
index 8b9f79d..c961a86 100644
--- a/streaming-mqtt/pom.xml
+++ b/streaming-mqtt/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/streaming-pubnub/pom.xml b/streaming-pubnub/pom.xml
index 8dbdab9..c5f45d2 100644
--- a/streaming-pubnub/pom.xml
+++ b/streaming-pubnub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>bahir-parent_2.11</artifactId>
<groupId>org.apache.bahir</groupId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/streaming-pubsub/pom.xml b/streaming-pubsub/pom.xml
index c4a9f3f..6e3d0d5 100644
--- a/streaming-pubsub/pom.xml
+++ b/streaming-pubsub/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>bahir-parent_2.11</artifactId>
<groupId>org.apache.bahir</groupId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/streaming-twitter/pom.xml b/streaming-twitter/pom.xml
index 653a228..01a574a 100644
--- a/streaming-twitter/pom.xml
+++ b/streaming-twitter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/streaming-zeromq/pom.xml b/streaming-zeromq/pom.xml
index 943eb9c..fac9d28 100644
--- a/streaming-zeromq/pom.xml
+++ b/streaming-zeromq/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-parent_2.11</artifactId>
- <version>2.3.2</version>
+ <version>2.3.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
[bahir] 03/03: Update release script to support branches
Posted by lr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/bahir.git
commit bd237d744aa3b12a43ef09d6fd7a7088a755d068
Author: Luciano Resende <lr...@apache.org>
AuthorDate: Sun May 19 17:26:06 2019 +0200
Update release script to support branches
---
dev/release-build.sh | 41 ++++++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/dev/release-build.sh b/dev/release-build.sh
index a2dc5e2..265a822 100755
--- a/dev/release-build.sh
+++ b/dev/release-build.sh
@@ -60,12 +60,14 @@ GPG_PASSPHRASE - Passphrase for GPG key used to sign release
EXAMPLES
release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT"
-release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --releaseRc="rc1"
-release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --tag="v2.3.0-rc1" --gitCommitHash="a874b73" --dryRun
+release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --releaseRc="rc1" --tag="v2.3.0-rc1"
+release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --releaseRc="rc1" --gitBranch="branch-2.3" --tag="v2.3.0-rc1"
+release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --releaseRc="rc1" --tag="v2.3.0-rc1" --gitCommitHash="a874b73" --dryRun
-release-build.sh --release-publish --gitTag="v2.3.0rc1"
+release-build.sh --release-publish --gitTag="v2.3.0-rc1"
release-build.sh --release-snapshot
+release-build.sh --release-snapshot --gitCommitHash="a874b73"
EOF
exit 1
@@ -101,6 +103,10 @@ while [ "${1+defined}" ]; do
GIT_REF="${PARTS[1]}"
shift
;;
+ --gitBranch)
+ GIT_BRANCH="${PARTS[1]}"
+ shift
+ ;;
--gitTag)
GIT_TAG="${PARTS[1]}"
shift
@@ -158,17 +164,25 @@ if [[ "$RELEASE_PREPARE" == "true" && -z "$DEVELOPMENT_VERSION" ]]; then
exit_with_usage
fi
-if [[ "$RELEASE_PUBLISH" == "true" ]]; then
- if [[ "$GIT_REF" && "$GIT_TAG" ]]; then
- echo "ERROR: Only one argumented permitted when publishing : --gitCommitHash or --gitTag"
+if [[ "$RELEASE_PREPARE" == "true" ]]; then
+ if [[ "$GIT_REF" && "$GIT_BRANCH" ]]; then
+ echo "ERROR: Only one argument permitted when publishing : --gitCommitHash or --gitBranch"
exit_with_usage
fi
- if [[ -z "$GIT_REF" && -z "$GIT_TAG" ]]; then
- echo "ERROR: --gitCommitHash OR --gitTag must be passed as an argument to run this script"
+fi
+
+if [[ "$RELEASE_PUBLISH" == "true" ]]; then
+ if [[ -z "$GIT_TAG" ]]; then
+ echo "ERROR: --gitTag must be passed as an argument to run this script"
exit_with_usage
fi
fi
+if [[ "$RELEASE_PUBLISH" == "true" && "$GIT_REF" ]]; then
+ echo "ERROR: --gitCommitHash not supported for --release-publish"
+ exit_with_usage
+fi
+
if [[ "$RELEASE_PUBLISH" == "true" && "$DRY_RUN" ]]; then
echo "ERROR: --dryRun not supported for --release-publish"
exit_with_usage
@@ -181,6 +195,9 @@ fi
# Commit ref to checkout when building
GIT_REF=${GIT_REF:-master}
+if [[ "$RELEASE_PREPARE" == "true" && "$GIT_BRANCH" ]]; then
+ GIT_REF="origin/$GIT_BRANCH"
+fi
if [[ "$RELEASE_PUBLISH" == "true" && "$GIT_TAG" ]]; then
GIT_REF="tags/$GIT_TAG"
fi
@@ -207,6 +224,7 @@ echo "------- Release preparation with the following parameters ---"
echo "-------------------------------------------------------------"
echo "Executing ==> $GOAL"
echo "Git reference ==> $GIT_REF"
+echo "Git branch ==> $GIT_BRANCH"
echo "release version ==> $RELEASE_VERSION"
echo "development version ==> $DEVELOPMENT_VERSION"
echo "rc ==> $RELEASE_RC"
@@ -227,7 +245,12 @@ function checkout_code {
rm -rf bahir
git clone https://git-wip-us.apache.org/repos/asf/bahir.git
cd bahir
- git checkout $GIT_REF
+ if [[ "$GIT_BRANCH" ]]; then
+ git checkout --track $GIT_REF
+ else
+ git checkout $GIT_REF
+ fi
+
git_hash=`git rev-parse --short HEAD`
echo "Checked out Bahir git hash $git_hash"
[bahir] 01/03: Set Spark version to 2.3.3 preparing for release
Posted by lr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/bahir.git
commit 940bfa4b8e98a6e725533739a9d2686a580f3c12
Author: Luciano Resende <lr...@apache.org>
AuthorDate: Sun May 19 17:05:44 2019 +0200
Set Spark version to 2.3.3 preparing for release
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ffeef14..cbb5f52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
<log4j.version>1.2.17</log4j.version>
<!-- Spark version -->
- <spark.version>2.3.2</spark.version>
+ <spark.version>2.3.3</spark.version>
<!-- MQTT Client -->
<mqtt.paho.client>1.1.0</mqtt.paho.client>