More Travis tuning

gephi · Oct 29, 2015 · e188256 · e188256
1 parent 3c77b6e
commit e188256
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 33 deletions.
diff --git a/modules/application/pom.xml b/modules/application/pom.xml
@@ -530,9 +530,10 @@
 
             <build>
                 <plugins>
-                    <!-- Enable the standard deploy phase -->
+                    <!-- Enable the standard install phase -->
                     <plugin>
-                        <artifactId>maven-deploy-plugin</artifactId>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-install-plugin</artifactId>
                         <configuration>
                             <skip>false</skip>
                         </configuration>

diff --git a/pom.xml b/pom.xml
@@ -102,9 +102,6 @@
         <gephi.menu.app.name>Gephi ${project.version}</gephi.menu.app.name>
         <gephi.innosetup.path>C:/Program Files (x86)/Inno Setup 5</gephi.innosetup.path>
 
-        <!-- Disable doclint for now as Javadoc is much more strict in 1.8 -->
-        <additionalparam>-Xdoclint:none</additionalparam>
-
         <!-- GitHub site-plugin authentification -->
         <github.global.server>github</github.global.server>
 
@@ -954,18 +951,6 @@
                 </configuration>
             </plugin>
 
-            <!-- Nexus staging, https://oss.sonatype.org/ -->
-            <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                </configuration>
-            </plugin>
-
             <!-- Override default-site -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -983,14 +968,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- Skip the standard deploy phase -->
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -1007,6 +984,31 @@
                 <gephi.javac.showWarnings>false</gephi.javac.showWarnings>
                 <gephi.javac.xlint>-Xlint:none</gephi.javac.xlint>
             </properties>
+
+            <build>
+                <plugins>
+                    <!-- Skip the standard install phase -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </plugin>
+
+                    <!-- Nexus staging, https://oss.sonatype.org/ -->
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
         <!-- Profile to create Javadoc -->
@@ -1060,14 +1062,6 @@
             <id>create-modules</id>
             <build>
                 <plugins>
-                    <!-- Enable the standard deploy phase -->
-                    <plugin>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </plugin>
-
                     <!-- Enable the standard install phase -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -1131,6 +1125,17 @@
             </properties>
         </profile>
 
+        <!-- Profile that disable doclint for now as Javadoc is much more strict in 1.8 -->
+        <profile>
+            <id>javadoc18</id>
+            <activation>
+                <jdk>1.8</jdk>
+            </activation>
+            <properties>
+                <additionalparam>-Xdoclint:none</additionalparam>
+            </properties>
+        </profile>
+
         <!-- Profile activated for windows/macos release only. Should be called alone so it only creates the windows installer/compressed dmg -->
         <profile>
             <id>release-extra</id>