Bump scala to 2.11.12

[odlparent.git] / odlparent-lite / pom.xml

diff --git a/odlparent-lite/pom.xml b/odlparent-lite/pom.xml
index 2b2a499e85bc22f137134de5b74078b6a8f0059a..ccd6758117b214960a34fec915820912be8dd2f0 100644 (file)
--- a/odlparent-lite/pom.xml
+++ b/odlparent-lite/pom.xml
@@ -17,7 +17,7 @@
 
   <groupId>org.opendaylight.odlparent</groupId>
   <artifactId>odlparent-lite</artifactId>
-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.8.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ODL :: odlparent :: ${project.artifactId}</name>
 
@@ -80,6 +80,13 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+    <!-- This property is used in the pluginManagement and the q profile as well as -D set e.g. in releng/builder by c/53426
+         to emulate a future "maven.gitcommitid.skip", which only a future not-yet-available-on-Maven-central maven-git-commit-id-plugin release has.
+         (If we ever upgrade the version of the maven-git-commit-id-plugin we use, then this and re. pluginManagement config could be removed; BUT then
+          the q profile and all -D in releng/builder etc. else would have to be changed from this "gitid.skip" to "maven.gitcommitid.skip.)
+      -->
+    <gitid.skip>false</gitid.skip>
   </properties>
 
   <build>
@@ -93,6 +100,10 @@
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.8.2</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-help-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
           <version>2.5.2</version>
@@ -147,7 +158,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.5.1</version>
+          <version>3.6</version>
           <configuration>
             <asciidoc>
               <attributes>
@@ -185,8 +196,20 @@
               <artifactId>asciidoctorj-diagram</artifactId>
               <version>1.3.1</version>
             </dependency>
+
+            <!-- Needed for JDK-9 compatibility -->
+            <dependency>
+              <groupId>commons-lang</groupId>
+              <artifactId>commons-lang</artifactId>
+              <version>2.6</version>
+            </dependency>
           </dependencies>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.5.0</version>
+        </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>jdepend-maven-plugin</artifactId>
@@ -290,6 +313,7 @@
           </execution>
         </executions>
         <configuration>
+          <skip>${gitid.skip}</skip>
           <failOnNoGitDirectory>false</failOnNoGitDirectory>
           <generateGitPropertiesFile>true</generateGitPropertiesFile>
           <generateGitPropertiesFilename>${project.build.outputDirectory}/META-INF/git.properties</generateGitPropertiesFilename>
@@ -338,6 +362,7 @@
             <skipIT>true</skipIT>
             <skipITs>true</skipITs>
             <skip.karaf.featureTest>true</skip.karaf.featureTest>
+            <skip.karaf4.featureTest>true</skip.karaf4.featureTest>
             <jacoco.skip>true</jacoco.skip>
             <maven.javadoc.skip>true</maven.javadoc.skip>
             <maven.source.skip>true</maven.source.skip>
@@ -349,18 +374,8 @@
             <invoker.skip>true</invoker.skip>
             <enforcer.skip>true</enforcer.skip>
             <mdsal.skip.verbose>true</mdsal.skip.verbose> <!-- Bug 6236 -->
+            <gitid.skip>true</gitid.skip>
         </properties>
-        <build>
-          <plugins>
-            <plugin>
-              <groupId>pl.project13.maven</groupId>
-              <artifactId>git-commit-id-plugin</artifactId>
-              <configuration>
-                <skip>true</skip>
-              </configuration>
-            </plugin>
-          </plugins>
-        </build>
     </profile>
     <profile>
       <!-- http://blog2.vorburger.ch/2016/06/maven-install-into-additional.html