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 2014/10/14 23:00:37 UTC
[13/23] git commit: more updates to cloudformation scripts
more updates to cloudformation scripts
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/83fccdd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/83fccdd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/83fccdd3
Branch: refs/heads/cloudformation-update
Commit: 83fccdd35eaee23a769a77bf39071ae70e6f3470
Parents: e64e9c9
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 17:37:50 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 17:37:50 2014 -0700
----------------------------------------------------------------------
stack/pom.xml | 10 +++-------
stack/rest/pom.xml | 21 ++++++++-------------
2 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/83fccdd3/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index b1bfe3c..c56942c 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -111,7 +111,7 @@
<org.springframework.version>3.1.2.RELEASE</org.springframework.version>
<shiro-version>1.2.0</shiro-version>
<slf4j-version>1.6.1</slf4j-version>
- <snakeyaml-version>1.6</snakeyaml-version>
+ <snakeyaml-version>1.8</snakeyaml-version>
<tomcat-version>7.0.52</tomcat-version>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
@@ -276,7 +276,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2</version>
+ <version>4.1.3</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
@@ -457,10 +457,6 @@
<version>${cassandra-version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
@@ -1247,7 +1243,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
- <version>4.11</version>
+ <version>4.10</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/83fccdd3/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index ef6cd26..4a99443 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -140,13 +140,17 @@
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+
+ <plugin>
<groupId>org.jasig.mojo.jspc</groupId>
<artifactId>jspc-maven-plugin</artifactId>
<version>2.0.0</version>
<configuration>
- <includeInProject>true</includeInProject>
- <inputWebXml>${basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml>
- <injectString><!--FRAGMENT--></injectString>
+ <includeInProject>false</includeInProject>
<webFragmentFile>${project.build.directory}/web-fragment.xml.txt</webFragmentFile>
</configuration>
<executions>
@@ -160,7 +164,7 @@
<dependencies>
<dependency>
<groupId>org.jasig.mojo.jspc</groupId>
- <artifactId>jspc-compiler-tomcat7</artifactId>
+ <artifactId>jspc-compiler-tomcat6</artifactId>
<version>2.0.0</version>
</dependency>
</dependencies>
@@ -168,15 +172,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/jspweb.xml</webXml>
- </configuration>
- <version>2.3</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<configuration>