more travis deployment tweaking

globalbioticinteractions · Sep 11, 2015 · 27c6f9f · 27c6f9f
1 parent b7bbe33
commit 27c6f9f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/.travis.deploy_if_tag.sh b/.travis.deploy_if_tag.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 if [ -n "$TRAVIS_TAG" ]; then
-  mvn clean deploy --settings .travis.maven.settings.xml -DskipTests
+  mvn -s .travis.maven.settings.xml -DskipTests clean deploy
 fi
diff --git a/.travis.maven.settings.xml b/.travis.maven.settings.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<settings 
-		xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-	<servers>
-		<server>
-			<id>globi-release</id>
-			<username>${env.S3_USER}</username>
-			<password>${env.S3_PASSWORD}</password>
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>globi-release</id>
+            <username>${env.S3_USER}</username>
+            <password>${env.S3_PASSWORD}</password>
+        </server>
+        <server>
+            <id>globi-snapshot</id>
+            <username>${env.S3_USER}</username>
+            <password>${env.S3_PASSWORD}</password>
 		</server>
-	</servers>
-
-</settings>
+    </servers>
+</settings>
diff --git a/eol-globi-parent/pom.xml b/eol-globi-parent/pom.xml
@@ -47,9 +47,9 @@
     <build>
         <extensions>
             <extension>
-                <groupId>com.allogy.maven.wagon</groupId>
+                <groupId>net.adamcin.org.kuali.maven.wagons</groupId>
                 <artifactId>maven-s3-wagon</artifactId>
-                <version>1.0</version>
+                <version>1.2.2</version>
             </extension>
         </extensions>
         <plugins>
@@ -62,7 +62,7 @@
                 <artifactId>maven-scm-plugin</artifactId>
                 <version>1.8.1</version>
                 <configuration>
-                  <tag>v${project.version}</tag>
+                    <tag>v${project.version}</tag>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,9 +41,9 @@
     <build>
         <extensions>
             <extension>
-                <groupId>com.allogy.maven.wagon</groupId>
+                <groupId>net.adamcin.org.kuali.maven.wagons</groupId>
                 <artifactId>maven-s3-wagon</artifactId>
-                <version>1.0</version>
+                <version>1.2.2</version>
             </extension>
         </extensions>
     </build>