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/11/04 23:59:29 UTC
[07/14] git commit: [APIBAAS-1362]Remove war file from the assembly
artifact and have maven upload them separately
[APIBAAS-1362]Remove war file from the assembly artifact and have maven upload them separately
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/036a5c01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/036a5c01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/036a5c01
Branch: refs/heads/key-row-sharding
Commit: 036a5c0115562c3b6e8aa6cf0dfe5ccf4ff25c01
Parents: 578ce4f
Author: ryan bridges <rb...@apigee.com>
Authored: Tue Nov 4 10:59:40 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Tue Nov 4 10:59:40 2014 -0500
----------------------------------------------------------------------
stack/awscluster/assembly.xml | 8 ++---
stack/awscluster/pom.xml | 66 ++++++++++++++++++++++++++------------
2 files changed, 50 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/036a5c01/stack/awscluster/assembly.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/assembly.xml b/stack/awscluster/assembly.xml
index aefa650..a0fc0aa 100644
--- a/stack/awscluster/assembly.xml
+++ b/stack/awscluster/assembly.xml
@@ -24,15 +24,15 @@
<includeBaseDirectory>false</includeBaseDirectory>
- <files>
+ <!-- <files>
<file>
- <outputDirectory>webapps</outputDirectory>
+ <outputDirectory>webapps</outputDirectory>
<source>${stack.war}</source>
- <destName>ROOT.war</destName>
+ <destName>ROOT.war</destName>
</file>
- </files>
+ </files> -->
<fileSets>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/036a5c01/stack/awscluster/pom.xml
----------------------------------------------------------------------
diff --git a/stack/awscluster/pom.xml b/stack/awscluster/pom.xml
index 049415d..9af3da6 100644
--- a/stack/awscluster/pom.xml
+++ b/stack/awscluster/pom.xml
@@ -30,7 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <aws.s3.release-bucket>ug-cloudformation</aws.s3.release-bucket>
+ <aws.s3.release-bucket>usergrid-jenkins-builds</aws.s3.release-bucket>
<stack.war>../rest/target/ROOT.war</stack.war>
<portal.dir>../../portal/dist/usergrid-portal</portal.dir>
</properties>
@@ -69,26 +69,52 @@
<goals>
<goal>java</goal>
</goals>
+ <id>upload-scripts</id>
+ <configuration>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>true</includePluginDependencies>
+ <classpathScope>runtime</classpathScope>
+ <executableDependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </executableDependency>
+ <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
+ <arguments>
+ <argument>--nodelete</argument>
+ <argument>--properties</argument>
+ <argument>${project.basedir}/aws.properties</argument>
+ <argument>UP</argument>
+ <argument>${aws.s3.release-bucket}</argument>
+ <argument>${project.build.directory}/${project.build.finalName}-any.tar.gz</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <phase>deploy</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <id>upload-war</id>
+ <configuration>
+ <includeProjectDependencies>true</includeProjectDependencies>
+ <includePluginDependencies>true</includePluginDependencies>
+ <classpathScope>runtime</classpathScope>
+ <executableDependency>
+ <groupId>net.java.dev.jets3t</groupId>
+ <artifactId>jets3t</artifactId>
+ </executableDependency>
+ <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
+ <arguments>
+ <argument>--nodelete</argument>
+ <argument>--properties</argument>
+ <argument>${project.basedir}/aws.properties</argument>
+ <argument>UP</argument>
+ <argument>${aws.s3.release-bucket}</argument>
+ <argument>${stack.war}</argument>
+ </arguments>
+ </configuration>
</execution>
</executions>
- <configuration>
- <includeProjectDependencies>true</includeProjectDependencies>
- <includePluginDependencies>true</includePluginDependencies>
- <classpathScope>runtime</classpathScope>
- <executableDependency>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </executableDependency>
- <mainClass>org.jets3t.apps.synchronize.Synchronize</mainClass>
- <arguments>
- <argument>--nodelete</argument>
- <argument>--properties</argument>
- <argument>${project.basedir}/aws.properties</argument>
- <argument>UP</argument>
- <argument>${aws.s3.release-bucket}</argument>
- <argument>${project.build.directory}/${project.build.finalName}-any.tar.gz</argument>
- </arguments>
- </configuration>
<dependencies>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
@@ -143,7 +169,7 @@
<artifactId>jets3t</artifactId>
<version>0.8.0</version>
</dependency>
-
+
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>