You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/03/23 17:30:44 UTC
[1/7] incubator-usergrid git commit: Debugging release script
Repository: incubator-usergrid
Updated Branches:
refs/heads/master 451dc0b9f -> 4d7be242c
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a7c6397c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a7c6397c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a7c6397c
Branch: refs/heads/master
Commit: a7c6397cb98b6ab53d527a83e293430990400d0a
Parents: 2f522ee
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jan 21 15:41:48 2015 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Mar 23 11:58:29 2015 -0400
----------------------------------------------------------------------
release/release.sh | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a7c6397c/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index c9421b0..411fb80 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -144,12 +144,12 @@ release_dir=${dist_dir}/${current_version}
mkdir -p $release_dir
cd $dist_dir
-if [[ $publish == 1 ]]; then
- echo "Publishing the release"
+#if [[ $publish == 1 ]]; then
+# echo "Publishing the release"
# Make and checkout the release dist directory
- svn mkdir ${usergrid_svn_dist_url}/${current_version} -m "usergrid-${current_version} release"
- svn co --depth=empty ${usergrid_svn_dist_url}/${current_version} ${release_dir}
-fi
+# svn mkdir ${usergrid_svn_dist_url}/${current_version} -m "usergrid-${current_version} release"
+# svn co --depth=empty ${usergrid_svn_dist_url}/${current_version} ${release_dir}
+#fi
# Now that the .usergridversion has been updated to the release version build the release source dist from it
cd $base_dir
@@ -167,10 +167,10 @@ gpg --print-md MD5 ${dist_name}.tar.gz > ${dist_name}.tar.gz.md5
# sha
shasum ${dist_name}.tar.gz > ${dist_name}.tar.gz.sha
-if [[ $publish == 1 ]]; then
+#if [[ $publish == 1 ]]; then
# Commit the release
- svn add .
- svn ci -m "usergrid-${current_version} release"
+# svn add .
+# svn ci -m "usergrid-${current_version} release"
# Finally delete all release candidate branches
# for ref in $(git for-each-ref --format='%(refname:short)' 'refs/heads/${current_version}-rc*') do
@@ -178,7 +178,7 @@ if [[ $publish == 1 ]]; then
# git push origin --delete ${ref}
# svn rm ${usergrid_svn_dev_dist_url}/${ref}
# done
-fi
+#fi
current_commit_id=`git rev-parse HEAD`
[3/7] incubator-usergrid git commit: Debugging release script
Posted by to...@apache.org.
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/be100a0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/be100a0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/be100a0d
Branch: refs/heads/master
Commit: be100a0dfdab329b4ae9d45c4e089bb850ca00b6
Parents: 451dc0b
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jan 21 15:29:11 2015 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Mar 23 11:58:29 2015 -0400
----------------------------------------------------------------------
release/release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/be100a0d/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 814cb78..1b67a6e 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -134,7 +134,7 @@ git tag -s "${current_version}" -m "usergrid-${current_version} release." $curre
if [[ $publish == 1 ]]; then
git push origin $current_version
- git push origin --tags
+ #git push origin --tags
fi
dist_name="apache-usergrid-${current_version}-incubating"
[4/7] incubator-usergrid git commit: Debugging release script
Posted by to...@apache.org.
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2f522ee9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2f522ee9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2f522ee9
Branch: refs/heads/master
Commit: 2f522ee95cfc67a414e8d54ecdb0d29e37f95bfe
Parents: 06d0843
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jan 21 15:36:37 2015 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Mar 23 11:58:29 2015 -0400
----------------------------------------------------------------------
release/release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/2f522ee9/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 2f0f6fb..c9421b0 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -169,7 +169,7 @@ shasum ${dist_name}.tar.gz > ${dist_name}.tar.gz.sha
if [[ $publish == 1 ]]; then
# Commit the release
- svn add usergrid-*
+ svn add .
svn ci -m "usergrid-${current_version} release"
# Finally delete all release candidate branches
[6/7] incubator-usergrid git commit: USERGRID-457 - Add explicit
Content-Length of 0 for POST request with no body.
Posted by to...@apache.org.
USERGRID-457 - Add explicit Content-Length of 0 for POST request with no body.
Conflicts:
stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/aadcf4cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/aadcf4cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/aadcf4cf
Branch: refs/heads/master
Commit: aadcf4cf4a5e520d6eedeffa5bc9e3b2ccb1fa73
Parents: a7c6397
Author: Michael Russo <mr...@apigee.com>
Authored: Thu Mar 19 20:12:45 2015 -0700
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Mar 23 12:00:06 2015 -0400
----------------------------------------------------------------------
.../apache/usergrid/security/providers/PingIdentityProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/aadcf4cf/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java b/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
index cc2fe6f..0d01fe7 100644
--- a/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
+++ b/stack/services/src/main/java/org/apache/usergrid/security/providers/PingIdentityProvider.java
@@ -129,7 +129,7 @@ public class PingIdentityProvider extends AbstractProvider {
.header("Content-Length", "0")
.post( JsonNode.class );
- String rawEmail = node.get( "access_token" ).get( "subject" ).getTextValue();
+ String rawEmail = node.get( "access_token" ).get( "subject" ).asText();
Map<String, Object> userMap = new HashMap<String, Object>();
userMap.put( "expiration", node.get( "expires_in" ).getLongValue() );
[5/7] incubator-usergrid git commit: Debugging release script
Posted by to...@apache.org.
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/06d08433
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/06d08433
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/06d08433
Branch: refs/heads/master
Commit: 06d0843325eca5095412156526a55363fb9ac150
Parents: 0e9f241
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jan 21 15:33:07 2015 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Mar 23 11:58:29 2015 -0400
----------------------------------------------------------------------
release/release.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/06d08433/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 912ce93..2f0f6fb 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -132,10 +132,10 @@ git commit -m "Updating .usergridversion to ${current_version}."
git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
-if [[ $publish == 1 ]]; then
+#if [[ $publish == 1 ]]; then
#git push origin $current_version
#git push origin --tags
-fi
+#fi
dist_name="apache-usergrid-${current_version}-incubating"
[2/7] incubator-usergrid git commit: Debugging release script
Posted by to...@apache.org.
Debugging release script
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0e9f2419
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0e9f2419
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0e9f2419
Branch: refs/heads/master
Commit: 0e9f24199a2effa6af0121596ba15c360470365b
Parents: be100a0
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jan 21 15:30:58 2015 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Mar 23 11:58:29 2015 -0400
----------------------------------------------------------------------
release/release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0e9f2419/release/release.sh
----------------------------------------------------------------------
diff --git a/release/release.sh b/release/release.sh
index 1b67a6e..912ce93 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -133,7 +133,7 @@ git commit -m "Updating .usergridversion to ${current_version}."
git tag -s "${current_version}" -m "usergrid-${current_version} release." $current_version
if [[ $publish == 1 ]]; then
- git push origin $current_version
+ #git push origin $current_version
#git push origin --tags
fi
[7/7] incubator-usergrid git commit: [USERGRID-457] incrementing
version
Posted by to...@apache.org.
[USERGRID-457] incrementing version
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4d7be242
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4d7be242
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4d7be242
Branch: refs/heads/master
Commit: 4d7be242c7b1b9cf2cd1ededf3e2dbf56fdb0ec9
Parents: aadcf4c
Author: ryan bridges <rb...@apigee.com>
Authored: Fri Mar 20 20:40:45 2015 -0400
Committer: ryan bridges <rb...@apigee.com>
Committed: Mon Mar 23 12:00:06 2015 -0400
----------------------------------------------------------------------
stack/build-tools/pom.xml | 2 +-
stack/config/pom.xml | 2 +-
stack/core/pom.xml | 2 +-
stack/java-sdk-old/pom.xml | 2 +-
stack/launcher/pom.xml | 2 +-
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 2 +-
stack/rest/pom.xml | 2 +-
stack/services/pom.xml | 2 +-
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 2 +-
stack/websocket/pom.xml | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/build-tools/pom.xml b/stack/build-tools/pom.xml
index 07bfc76..181c33c 100644
--- a/stack/build-tools/pom.xml
+++ b/stack/build-tools/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/config/pom.xml
----------------------------------------------------------------------
diff --git a/stack/config/pom.xml b/stack/config/pom.xml
index 7c7105f..0ea0048 100644
--- a/stack/config/pom.xml
+++ b/stack/config/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index d3e3e4e..2db39fb 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/java-sdk-old/pom.xml
----------------------------------------------------------------------
diff --git a/stack/java-sdk-old/pom.xml b/stack/java-sdk-old/pom.xml
index faa4b88..09b4c05 100644
--- a/stack/java-sdk-old/pom.xml
+++ b/stack/java-sdk-old/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/stack/launcher/pom.xml b/stack/launcher/pom.xml
index b3b3949..b3d7c6b 100644
--- a/stack/launcher/pom.xml
+++ b/stack/launcher/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/mongo-emulator/pom.xml
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/pom.xml b/stack/mongo-emulator/pom.xml
index 7f03b61..8d1763c 100644
--- a/stack/mongo-emulator/pom.xml
+++ b/stack/mongo-emulator/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 9bc0b06..6406474 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<name>Usergrid Parent</name>
<description>Parent module for the Apache Usergrid Project</description>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 943e868..b55e51f 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 6b1bcdc..c7e0084 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index daa9f98..862aa78 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/tools/pom.xml b/stack/tools/pom.xml
index 0fac833..ee8a821 100644
--- a/stack/tools/pom.xml
+++ b/stack/tools/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d7be242/stack/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/stack/websocket/pom.xml b/stack/websocket/pom.xml
index 64f4515..f10d49e 100644
--- a/stack/websocket/pom.xml
+++ b/stack/websocket/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.usergrid</groupId>
<artifactId>usergrid</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1-1-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>