You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/17 20:09:50 UTC
[1/2] git commit: fixing dependency tree for httpcomponents
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 3bae36b01 -> 2cdcf6240
fixing dependency tree for httpcomponents
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3907a77f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3907a77f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3907a77f
Branch: refs/heads/two-dot-o
Commit: 3907a77fc2d255a45677965bd1a7236bebe28809
Parents: 5a04107
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 17 12:09:01 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 17 12:09:01 2014 -0600
----------------------------------------------------------------------
stack/corepersistence/common/pom.xml | 13 +++----------
stack/corepersistence/pom.xml | 1 +
stack/corepersistence/queue/pom.xml | 8 +++++++-
stack/pom.xml | 19 +++++++++++++++++--
4 files changed, 28 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3907a77f/stack/corepersistence/common/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/pom.xml b/stack/corepersistence/common/pom.xml
index 42511c8..ee6a67b 100644
--- a/stack/corepersistence/common/pom.xml
+++ b/stack/corepersistence/common/pom.xml
@@ -131,18 +131,11 @@
<!-- aws sdks -->
<dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>1.7.5</version>
- <exclusions>
- <exclusion>
- <artifactId>jackson-databind</artifactId>
- <groupId>com.fasterxml.jackson.core</groupId>
- </exclusion>
- </exclusions>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>${aws.version}</version>
</dependency>
-
<dependency>
<groupId>org.jukito</groupId>
<artifactId>jukito</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3907a77f/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index fac5db9..d57b86f 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -74,6 +74,7 @@ limitations under the License.
<rx.version>0.19.6</rx.version>
<slf4j.version>1.7.2</slf4j.version>
<surefire.version>2.16</surefire.version>
+ <aws.version>1.9.0</aws.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3907a77f/stack/corepersistence/queue/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/pom.xml b/stack/corepersistence/queue/pom.xml
index 94f11a8..a2e3c2d 100644
--- a/stack/corepersistence/queue/pom.xml
+++ b/stack/corepersistence/queue/pom.xml
@@ -82,7 +82,13 @@
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
- <version>1.8.11</version>
+ <version>${aws.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3907a77f/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index df656c0..2217a93 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -278,7 +278,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.3</version>
+ <version>4.2</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
@@ -355,7 +355,22 @@
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
</exclusion>
-
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcomponents-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcomponents-core</artifactId>
+ </exclusion>
<exclusion>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by sf...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/2cdcf624
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/2cdcf624
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/2cdcf624
Branch: refs/heads/two-dot-o
Commit: 2cdcf6240df2ac13dbcbfbf6e55f358854261bfa
Parents: 3907a77 3bae36b
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Oct 17 12:09:22 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Oct 17 12:09:22 2014 -0600
----------------------------------------------------------------------
.../main/dist/init_instance/install_elasticsearch.sh | 13 +++++++++++++
stack/awscluster/ugcluster-cf.json | 8 ++++++++
2 files changed, 21 insertions(+)
----------------------------------------------------------------------