From bd194b3e9754a690aa158fbcb4c8f6508525720b Mon Sep 17 00:00:00 2001
From: Gonzalo Ortiz Jaureguizar <gortiz@8kdata.com>
Date: Tue, 12 Jan 2016 11:59:55 +0100
Subject: [PATCH] Moved integration tests to a new profile called _integration_

Integration tests have been moved from _safer_ profile to a specific
_integration_ profile. All commiters must compile their branches with
_safer_ profile before their pull requests, but it doesn't seem to be
very realistic to force all commiters to have their develop environment
ready to run our integration tests (at least meanwhile they require very
specific environment configurations to be run).

Travis has been modified to enable both _safer_ and _integration_ tests,
so all PR will run the integration tests before they will be accepted.
---
 .travis.yml |  9 +--------
 pom.xml     | 41 ++++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5badc2a..e73d5ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: java
-script: mvn -Psafer -Passembler -B -e -T 1C verify
+script: mvn -Psafer -Pintegration -Passembler -B -e -T 1C verify
 jdk:
 - oraclejdk8
 - oraclejdk7
@@ -13,13 +13,6 @@ before_deploy:
   - echo "<settings><servers><server><id>ossrh-snapshot</id><username>\${env.MAVEN_DEPLOY_USER}</username><password>\${env.MAVEN_DEPLOY_PASS}</password></server><server><id>ossrh-release</id><username>\${env.MAVEN_DEPLOY_USER}</username><password>\${env.MAVEN_DEPLOY_PASS}</password></server></servers></settings>" > ~/settings.xml
 
 deploy:
-- provider: script
-  script: mvn -B -e -T 1C -Pdeploy -DskipTests=true deploy --settings ~/settings.xml
-  skip_cleanup: true
-  on:
-    repo: 8kdata/mongowp
-    tags: true
-    jdk: oraclejdk8
 - provider: script
   script: mvn -B -e -T 1C -Pdeploy -DskipTests=true deploy --settings ~/settings.xml
   skip_cleanup: true
diff --git a/pom.xml b/pom.xml
index 1b8ca96..caae72a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,23 +331,24 @@
                             </execution>
                         </executions>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>sign</id>
+            <build>
+                <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.19</version>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
                         <executions>
                             <execution>
-                                <id>integration-tests</id>
-                                <phase>integration-test</phase>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
                                 <goals>
-                                    <goal>test</goal>
+                                    <goal>sign</goal>
                                 </goals>
-                                <configuration>
-                                    <skip>false</skip>
-                                    <includes>
-                                        <include>%regex[.*integration.*]</include>
-                                    </includes>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
@@ -355,20 +356,26 @@
             </build>
         </profile>
         <profile>
-            <id>sign</id>
+            <id>integration</id>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>2.19</version>
                         <executions>
                             <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
+                                <id>integration-tests</id>
+                                <phase>integration-test</phase>
                                 <goals>
-                                    <goal>sign</goal>
+                                    <goal>test</goal>
                                 </goals>
+                                <configuration>
+                                    <skip>false</skip>
+                                    <includes>
+                                        <include>%regex[.*integration.*]</include>
+                                    </includes>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>