Merge "Fix checkstyle if-statements must use braces in yang-parser-impl"

[yangtools.git] / common / parent / pom.xml

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 4ca439428d019d368b4f10a7d6ce98a0f49fe798..7a213959341bd941e4f29f6a3d045d521fed8f3f 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -27,18 +27,11 @@
     </prerequisites>
 
     <properties>
-        <commons.io.version>2.4</commons.io.version>
-        <ctrie.version>0.2.0</ctrie.version>
-        <exam.version>3.0.0</exam.version>
-        <groovy.version>2.1.6</groovy.version>
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
-        <karaf.version>3.0.1</karaf.version>
-        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-        <maven.javadoc.version>2.9.1</maven.javadoc.version>
-        <jsr305.version>2.0.1</jsr305.version>
-        <maven.depends.version>1.2</maven.depends.version>
 
-        <!-- Sonar config -->
+        <!-- FIXME: these will be upstreamed -->
+        <maven.depends.version>1.2</maven.depends.version>
+        <maven.javadoc.version>2.9.1</maven.javadoc.version>
         <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
         <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
         <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
@@ -120,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>
@@ -472,14 +465,13 @@
         </pluginManagement>
 
         <plugins>
-            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.0</version>
+                <!--
                 <executions>
                     <execution>
-                        <id>enforce</id>
+                        <id>enforce-dependencies</id>
                         <configuration>
                             <rules>
                                 <DependencyConvergence />
@@ -490,8 +482,9 @@
                         </goals>
                     </execution>
                 </executions>
+                -->
             </plugin>
-            -->
+
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <version>2.5</version>