Merge pull request #4396 from vespa-engine/gjoranv/revert-plugin-config

Move plugin management back to parent.

2 files changed, 79 insertions, 65 deletions

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 6e110aa93d5..2e23e550352 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -34,28 +34,33 @@
         <url>git@github.com:vespa-engine/vespa.git</url>
     </scm>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${surefire.version}</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>${surefire.version}</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
+    <!-- TODO: add pluginManagement for bundle-plugin and/or compiler-plugin?
+        <build>
+            <pluginManagement>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.6.1</version>
+                        <configuration>
+                            <source>1.8</source>
+                            <target>1.8</target>
+                            <optimize>true</optimize>
+                       </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.yahoo.vespa</groupId>
+                        <artifactId>bundle-plugin</artifactId>
+                        <version>${project.version}</version>
+                        <configuration>
+                            <configGenVersion>${project.version}</configGenVersion>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </pluginManagement>
+        </build>
+    -->
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -406,20 +411,6 @@
                 <version>${jetty.version}</version>
             </dependency>
 
-            <dependency>
-                <!-- NOT provided from jdisc runtime -->
-                <groupId>org.apache.maven.surefire</groupId>
-                <artifactId>surefire-junit4</artifactId>
-                <version>${surefire.version}</version>
-            </dependency>
-            <dependency>
-                <!-- NOT provided from jdisc runtime -->
-                <groupId>org.apache.maven.surefire</groupId>
-                <artifactId>surefire-providers</artifactId>
-                <version>${surefire.version}</version>
-                <type>pom</type>
-            </dependency>
-
             <!-- Please don't add deps here, but instead above the NOTE. -->
 
         </dependencies>
@@ -432,9 +423,8 @@
         <guice.version>3.0</guice.version>
         <jetty.version>9.4.6.v20170531</jetty.version>
         <slf4j.version>1.7.5</slf4j.version>
-        <surefire.version>2.19.1</surefire.version> <!-- NOTE bjorncs 15.06.2017: Version 2.20 has OoM issues -->
 
-        <!-- NOTE: These must be kept in sync with version used by current jersey2.version. -->
+        <!-- These must be kept in sync with version used by current jersey2.version. -->
         <!-- MUST be updated each time jersey2 is upgraded! -->
         <!-- Check versions by doing: ' ls -l vespa/vespa_jersey2/target/dependency' -->
         <hk2.version>2.5.0-b05</hk2.version>
@@ -446,7 +436,6 @@
         <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
         <jersey2.version>2.23.2</jersey2.version>
         <mimepull.version>1.9.6</mimepull.version>
-        <!-- Please don't add properties here, but instead above the jersey2 NOTE. -->
     </properties>
 
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index ea9d0d93b5b..0a19d66d674 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,33 +69,6 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                        <optimize>true</optimize>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <configuration>
-                        <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
-                        <systemPropertyVariables>
-                            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
-                        </systemPropertyVariables>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-report-plugin</artifactId>
-                    <configuration>
-                        <alwaysGenerateSurefireReport>false</alwaysGenerateSurefireReport>
-                        <showSuccess>false</showSuccess>
-                    </configuration>
-                </plugin>
-                <plugin>
                     <groupId>org.antlr</groupId>
                     <artifactId>antlr3-maven-plugin</artifactId>
                     <version>${antlr.version}</version>
@@ -117,6 +90,26 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.6.1</version>
+                    <configuration>
+                        <source>1.8</source>
+                        <target>1.8</target>
+                        <showWarnings>true</showWarnings>
+                        <optimize>true</optimize>
+                        <showDeprecation>false</showDeprecation>
+	                <compilerArgs>
+	                    <arg>-Xlint:all</arg>
+	                    <arg>-Xlint:-serial</arg>
+	                    <arg>-Xlint:-try</arg>
+	                    <arg>-Xlint:-processing</arg>
+	                    <arg>-Xlint:-varargs</arg>
+	                    <arg>-Werror</arg>
+	                </compilerArgs>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.10</version>
                 </plugin>
@@ -185,6 +178,26 @@
                     </configuration>
                 </plugin>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${surefire.version}</version>
+                    <configuration>
+                        <redirectTestOutputToFile>${test.hide}</redirectTestOutputToFile>
+                        <systemPropertyVariables>
+                            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+                        </systemPropertyVariables>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>${surefire.version}</version>
+                    <configuration>
+                        <alwaysGenerateSurefireReport>false</alwaysGenerateSurefireReport>
+                        <showSuccess>false</showSuccess>
+                    </configuration>
+                </plugin>
+                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.9.1</version>
@@ -532,6 +545,17 @@
                 <version>3.0.2</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit4</artifactId>
+                <version>${surefire.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-providers</artifactId>
+                <version>${surefire.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
                 <groupId>org.codehaus.jettison</groupId>
                 <artifactId>jettison</artifactId>
                 <version>1.3.1</version>
@@ -688,6 +712,7 @@
     	<doclint>all</doclint>
         <scala.major-version>2.11</scala.major-version>
         <scala.version>${scala.major-version}.4</scala.version>
+        <surefire.version>2.19.1</surefire.version> <!-- NOTE bjorncs 15.06.2017: Version 2.20 has OoM issues -->
     </properties>
 
 </project>