Merge "Bug 2561: Parser incorrectly allows usage of union in list"

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

diff --git a/common/parent/pom.xml b/common/parent/pom.xml
index 9fbcb50d5d7408167baa917231523d58e57bf0ef..a5b37272aca40df9a2d384f917a80fe7f478a0d2 100644 (file)
--- a/common/parent/pom.xml
+++ b/common/parent/pom.xml
@@ -22,9 +22,6 @@
     <groupId>org.opendaylight.yangtools</groupId>
     <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <prerequisites>
-        <maven>3.0.4</maven>
-    </prerequisites>
 
     <properties>
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
@@ -36,47 +33,8 @@
         <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 -->
@@ -113,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>
@@ -133,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>
@@ -436,7 +394,7 @@
                 <plugin>
                     <groupId>org.eclipse.xtend</groupId>
                     <artifactId>xtend-maven-plugin</artifactId>
-                    <version>${xtend.version}</version>
+                    <version>2.7.3</version>
                     <executions>
                         <execution>
                             <goals>
@@ -487,7 +445,6 @@
 
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -510,7 +467,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>${maven.source.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -527,7 +483,6 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.7.2.201409121644</version>
                 <executions>
                     <execution>
                         <id>prepare-ut-agent</id>
@@ -578,7 +533,7 @@
 
 
     <!-- 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 
+         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 -->