Code Review / yangtools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Removed unused dependency."
[yangtools.git] / common / parent / pom.xml
diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 4ca439428d019d368b4f10a7d6ce98a0f49fe798..da7b5eacbc2bb2ca9b991034e57cd4c49a9f3108 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -13,77 +13,28 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
         <relativePath></relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>yangtools-parent</artifactId>
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </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>
+        <yangtools.version>0.8.0-SNAPSHOT</yangtools.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>
         <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-        <sonar.profile>Sonar way with Findbugs</sonar.profile>
     </properties>
 
-    <profiles>
-        <profile>
-            <id>jdk1.8</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-javadoc-plugin</artifactId>
-                            <version>${maven.javadoc.version}</version>
-                            <configuration>
-                                <stylesheetfile>stylesheet.css</stylesheetfile>
-                                <additionalparam>-Xdoclint:none</additionalparam>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <id>attach-javadocs</id>
-                                    <goals>
-                                        <goal>jar</goal>
-                                    </goals>
-                                </execution>
-                                <execution>
-                                    <goals>
-                                        <goal>aggregate</goal>
-                                    </goals>
-                                    <phase>site</phase>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-    </profiles>
-
     <dependencyManagement>
         <dependencies>
             <!-- Testing Dependencies -->
@@ -120,12 +71,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>
@@ -140,7 +91,7 @@
             <dependency>
                 <groupId>org.eclipse.xtend</groupId>
                 <artifactId>org.eclipse.xtend.lib</artifactId>
-                <version>2.4.3</version>
+                <version>2.7.3</version>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
@@ -297,7 +248,7 @@
                                         </goals>
                                      </pluginExecutionFilter>
                                      <action>
-                                         <ignore />
+                                         <execute/>
                                      </action>
                                  </pluginExecution>
                                  <pluginExecution>
@@ -339,6 +290,19 @@
                                          <ignore/>
                                      </action>
                                  </pluginExecution>
+                                 <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.maven.plugins</groupId>
+                                        <artifactId>maven-checkstyle-plugin</artifactId>
+                                        <versionRange>[2.12,)</versionRange>
+                                        <goals>
+                                            <goal>check</goal>
+                                        </goals>
+                                     </pluginExecutionFilter>
+                                     <action>
+                                         <execute/>
+                                     </action>
+                                 </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>
                     </configuration>
@@ -346,7 +310,7 @@
                 <plugin>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>yang-maven-plugin</artifactId>
-                    <version>0.7.0-SNAPSHOT</version>
+                    <version>0.8.0-SNAPSHOT</version>
                     <executions>
                         <execution>
                             <goals>
@@ -380,7 +344,7 @@
                         <dependency>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>0.7.0-SNAPSHOT</version>
+                            <version>0.8.0-SNAPSHOT</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>
@@ -443,7 +407,7 @@
                 <plugin>
                     <groupId>org.eclipse.xtend</groupId>
                     <artifactId>xtend-maven-plugin</artifactId>
-                    <version>${xtend.version}</version>
+                    <version>2.7.3</version>
                     <executions>
                         <execution>
                             <goals>
@@ -472,14 +436,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,11 +453,11 @@
                         </goals>
                     </execution>
                 </executions>
+                -->
             </plugin>
-            -->
+
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -517,7 +480,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>${maven.source.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -534,7 +496,6 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.2.201409121644</version>
                 <executions>
                     <execution>
                         <id>prepare-ut-agent</id>
@@ -582,39 +543,4 @@
             </plugin>
         </plugins>
     </reporting>
-
-
-    <!-- Note: we can not use variables for these URLs because we need to
-         be able to download the parent pom from the repository the first 
-         time we go to use it (since it is in a different project).
-         To override the settings, use the "mirror" section of the
-         settings.xml. See http://maven.apache.org/settings.html -->
-    <repositories>
-        <!-- OpenDayLight Repo Mirror -->
-        <repository>
-            <id>opendaylight-mirror</id>
-            <name>opendaylight-mirror</name>
-            <url>http://nexus.opendaylight.org/content/groups/public/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>never</updatePolicy>
-            </releases>
-        </repository>
-
-        <!-- OpenDayLight Snapshot artifact -->
-        <repository>
-            <id>opendaylight-snapshot</id>
-            <name>opendaylight-snapshot</name>
-            <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-    </repositories>
 </project>
OpenDaylight YANG Tools