BUG-1914: bump API requirement

This bumps the required maven API version 3.1.1 and removes the manual
override needed with previous versions.

Change-Id: If3b85169dccc9583ee93114c2b0c4f3fc9e17eb2
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index ec862465669992981b907c253a7a25a1b664ca06..f8ccd295a21b245bc927a267b9821857177939cf 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -53,13 +53,6 @@
             <artifactId>plexus-slf4j-logging</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.sonatype.sisu</groupId>
-            <artifactId>sisu-guava</artifactId>
-            <version>0.11.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 9fbcb50d5d7408167baa917231523d58e57bf0ef..7a213959341bd941e4f29f6a3d045d521fed8f3f 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -113,12 +113,12 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>3.0.5</version>
+                <version>3.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
-                <version>3.0.5</version>
+                <version>3.1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.javassist</groupId>