You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/07/24 17:22:06 UTC
[38/50] [abbrv] incubator-usergrid git commit: Merge branch
'two-dot-o' into two-dot-o-dev
Merge branch 'two-dot-o' into two-dot-o-dev
Conflicts:
stack/core/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fedf1651
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fedf1651
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fedf1651
Branch: refs/heads/USERGRID-869
Commit: fedf16516b1f5eb26281b8d9cf6ed3b260c715f5
Parents: d32cee4 066d7db
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Jul 22 09:46:21 2015 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Jul 22 09:46:21 2015 -0400
----------------------------------------------------------------------
stack/pom.xml | 2 +-
stack/tools/pom.xml | 6 +
.../org/apache/usergrid/tools/ExportAdmins.java | 117 ++--
.../org/apache/usergrid/tools/ExportApp.java | 536 +++++++++++++++++++
.../usergrid/tools/ExportDataCreator.java | 244 +++++++--
.../usergrid/tools/ExportingToolBase.java | 2 +-
.../org/apache/usergrid/tools/ImportAdmins.java | 226 ++++++--
stack/tools/src/main/resources/log4j.properties | 5 +
.../apache/usergrid/tools/ExportAppTest.java | 118 ++++
.../usergrid/tools/ExportImportAdminsTest.java | 71 ++-
...adata.usergrid-management.1433331614293.json | 52 ++
...users.usergrid-management.1433331614293.json | 12 +
12 files changed, 1224 insertions(+), 167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fedf1651/stack/pom.xml
----------------------------------------------------------------------
diff --cc stack/pom.xml
index d7f279d,cc39e04..6f984e3
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@@ -109,10 -109,10 +109,10 @@@
<jersey-version>1.18.1</jersey-version>
<junit-version>4.12</junit-version>
<log4j-version>1.2.16</log4j-version>
- <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
+ <org.springframework.version>3.2.13.RELEASE</org.springframework.version>
<shiro-version>1.2.3</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
- <snakeyaml-version>1.8</snakeyaml-version>
+ <snakeyaml-version>1.9</snakeyaml-version>
<tomcat-version>7.0.59</tomcat-version>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fedf1651/stack/tools/src/main/resources/log4j.properties
----------------------------------------------------------------------