X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=odlparent%2Fpom.xml;h=795ee7d6a34d27a1bb69d8ec9c58e5a9901be28f;hb=a92025556a8e6546972df2de857e9bfe3e09f10c;hp=983ede202d61a9297f5a566392c06ee9f7de1a9a;hpb=0f902f2e34ea51d79050ff77f8b9c05300407ad9;p=odlparent.git

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 983ede202..795ee7d6a 100644
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -8,42 +8,40 @@
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
   <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>1.6.0-SNAPSHOT</version>
+    <relativePath>../odlparent-lite</relativePath>
+  </parent>
+
   <groupId>org.opendaylight.odlparent</groupId>
   <artifactId>odlparent</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.0.4</maven>
-  </prerequisites>
+
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</developerConnection>
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/ODL_Root_Parent:Main</url>
   </scm>
-  <distributionManagement>
-    <!-- OpenDayLight Released artifact -->
-    <repository>
-      <id>opendaylight-release</id>
-      <url>${nexusproxy}/repositories/opendaylight.release/</url>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <snapshotRepository>
-      <id>opendaylight-snapshot</id>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </snapshotRepository>
-    <site>
-      <id>${project.artifactId}-site</id>
-      <url>./</url>
-    </site>
-  </distributionManagement>
+
+  <prerequisites>
+    <!-- This is only used to prevent building with Maven < 3 and to appease
+         maven-dependency-plugin; our real Maven requirement is enforced by
+         the enforcer plugin. -->
+    <maven>3.0.5</maven>
+  </prerequisites>
+
+  <!-- Variables should only be used where genuinely useful (to avoid
+       repetition); in general versions should be specified in the
+       corresponding dependencyManagement or pluginManagement element, not as
+       a variable. -->
   <properties>
-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <nexus.repository.release>opendaylight.release</nexus.repository.release>
     <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>
-    <nexus.repository.snapshot>opendaylight.snapshot</nexus.repository.snapshot>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -56,108 +54,112 @@
     <java.version.target>${maven.compiler.target}</java.version.target>
 
     <!-- Maven plugin versions, in the 'canonical' format -->
-    <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
-    <maven.bundle.version>2.5.3</maven.bundle.version>
+    <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
+    <maven.bundle.version>3.0.0</maven.bundle.version>
     <maven.clean.plugin.version>2.6.1</maven.clean.plugin.version>
-    <maven.compile.plugin.version>3.2</maven.compile.plugin.version>
-    <maven.install.plugin.version>2.5.2</maven.install.plugin.version>
-    <maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
-    <maven.depends.version>1.2</maven.depends.version>
-    <maven.jar.version>2.3.2</maven.jar.version> <!-- FIXME: bump to 2.4 -->
-    <maven.javadoc.version>2.10.1</maven.javadoc.version>
-    <maven.release.version>2.5.1</maven.release.version>
-    <maven.source.version>2.4</maven.source.version>
-    <maven.surefire.version>2.18</maven.surefire.version>
+    <maven.compile.plugin.version>3.3</maven.compile.plugin.version>
+    <maven.jar.version>2.6</maven.jar.version>
+    <maven.javadoc.version>2.10.3</maven.javadoc.version>
+    <maven.plugin.version>3.4</maven.plugin.version>
+    <maven.release.version>2.5.2</maven.release.version>
+    <maven.surefire.version>2.18.1</maven.surefire.version>
 
     <!-- Maven plugin versions, in random formats -->
     <bundle.plugin.version>${maven.bundle.version}</bundle.plugin.version>
-    <checkstyle.version>2.13</checkstyle.version>
-    <compiler.version>2.3.2</compiler.version> <!-- FIXME: should become ${maven.compile.plugin.version} -->
-    <enforcer.version>1.3.1</enforcer.version>
-    <paxexam.plugin.version>1.2.4</paxexam.plugin.version> <!-- FIXME: this is latest version of paxexam plugin -->
-    <enunciate.version>1.28</enunciate.version> <!-- Needs to remain exported, as its used for dependencies, too -->
+    <checkstyle.version>2.16</checkstyle.version>
+    <compiler.version>${maven.compile.plugin.version}</compiler.version>
+    <enforcer.version>1.4</enforcer.version>
+    <enunciate.version>1.30.1</enunciate.version> <!-- Needs to remain exported, as its used for dependencies, too -->
     <exam.version>4.4.0</exam.version> <!-- Needs to remain exported, as its used for dependencies, too -->
-    <failsafe.version>2.18</failsafe.version>
+    <failsafe.version>2.18.1</failsafe.version>
     <gmaven.plugin.version>1.0</gmaven.plugin.version>
+    <!--
+        Regression in jacoco-plugin 0.7.5 prevents us from upgrading to it
+        http://jira.xwiki.org/browse/XCOMMONS-821
+
+        Additionally we need to stay on jacoco 0.7.2.201409121644. Future
+        versions appear to have issues picking up code coverage for projects
+        that use PowerMock.
+        https://github.com/jayway/powermock/issues/564
+    -->
     <jacoco.version>0.7.2.201409121644</jacoco.version>
-    <jar.plugin.version>2.5</jar.plugin.version> <!-- FIXME: should become ${maven.jar.version} -->
-    <karaf.version>3.0.1</karaf.version> <!-- Needs to remain exported, as its used for dependencies, too -->
+    <jar.plugin.version>${maven.jar.version}</jar.plugin.version>
+    <karaf.version>3.0.3</karaf.version> <!-- Needs to remain exported, as its used for dependencies, too -->
     <projectinfo>2.6</projectinfo>
     <propertymavenplugin.version>1.0-alpha-2</propertymavenplugin.version>
-    <releaseplugin.version>2.3.2</releaseplugin.version> <!-- FIXME: should become ${maven.release.version} -->
-    <siteplugin>3.4</siteplugin>
-    <!--
-         This needs to remain exported, as we use it for dependencies, too.
-         We cannot bump it freely, as this version is tied to
-         org.opendaylight.yangtools.thirdparty/xtend-lib-osgi, which only
-         has 2.4.3. Long-term goal is to get rid of xtend completely.
-         -->
-    <xtend.version>2.4.3</xtend.version>
-    <odl.checkstyle.version>0.0.1-SNAPSHOT</odl.checkstyle.version>
+    <releaseplugin.version>${maven.release.version}</releaseplugin.version>
+    <odl.checkstyle.version>0.1.0-SNAPSHOT</odl.checkstyle.version>
 
     <!-- Supporting Libraries -->
-    <aopalliance.version>1.0.0</aopalliance.version>
-    <aries.util.version>1.1.0</aries.util.version>
-    <asm.version>4.1</asm.version>
-    <bouncycastle.version>1.50</bouncycastle.version>
-    <commons.codec.version>1.8</commons.codec.version>
-    <commons.fileupload.version>1.2.2</commons.fileupload.version>
-    <commons.io.version>2.4</commons.io.version>
-    <commons.lang3.version>3.1</commons.lang3.version>
+    <!-- Used by controller, netconf -->
+    <bouncycastle.version>1.52</bouncycastle.version>
+    <!-- Used by aaa, vtn -->
+    <commons.codec.version>1.10</commons.codec.version>
+    <!-- Used by netconf, ovsdb -->
+    <commons.lang3.version>3.4</commons.lang3.version>
+    <!-- Used by sfc, snmp4sdn; see also affinity, toolkit -->
     <commons.lang.version>2.6</commons.lang.version>
-    <commons.net.version>3.0.1</commons.net.version>
-    <corsfilter.version>7.0.42</corsfilter.version>
-    <ctrie.version>0.2.23</ctrie.version>
-    <eclipse.persistence.version>2.5.0</eclipse.persistence.version>
-    <feature.transaction.version>1.0.1</feature.transaction.version>
-    <felix.dependencymanager.shell.version>3.0.1</felix.dependencymanager.shell.version>
+    <!-- Used by neutron; see also controller, vtn -->
+    <commons.net.version>3.3</commons.net.version>
+    <!-- To upgrade to 2.6.0, we need to ensure all downstreams pull in javax.validation first
+         http://stackoverflow.com/questions/28568154/how-to-get-eclipselink-2-6-0-m3-working-with-jersey-1-18-3 -->
+    <!-- Used by neutron -->
+    <eclipse.persistence.version>2.5.2</eclipse.persistence.version>
+    <!-- Used by aaa -->
     <felix.dependencymanager.version>3.1.0</felix.dependencymanager.version>
-    <felix.fileinstall.version>3.1.6</felix.fileinstall.version>
-    <felix.webconsole.version>4.2.0</felix.webconsole.version>
-    <geminiweb.version>2.2.0.RELEASE</geminiweb.version>
-    <groovy.version>2.1.6</groovy.version>
-    <gson.version>2.2.4</gson.version>
-    <guava.version>14.0.1</guava.version>
+    <!-- Used by lacp, netconf, ovsdb, sfc, toolkit; see also vtn -->
+    <gson.version>2.3.1</gson.version>
+    <!-- Used by aaa, dlux, persistence, snmp4sdn, sxp -->
+    <guava.version>18.0</guava.version>
+    <!-- Used by lispflowmapping, sxp, vtn/manager -->
     <hamcrest.version>1.3</hamcrest.version>
+    <!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, integration/distribution, snmp4sdn, toolkit, ttp -->
     <jackson.version>2.3.2</jackson.version>
-    <javassist.version>3.18.2-GA</javassist.version>
-    <javax.annotation.version>1.2</javax.annotation.version>
-    <jaxrs-api.version>3.0.4.Final</jaxrs-api.version>
-    <jersey-servlet.version>1.17</jersey-servlet.version>
+    <!-- Used by snmp4sdn, yangtools -->
+    <javassist.version>3.20.0-GA</javassist.version>
+
+    <!-- FIXME remove all dependencies for jersey 1.17 after migration all projects -->
+    <!-- Used by aaa, alto, netconf, neutron, sfc; see also affinity, defense4all, snmp4sdn, toolkit -->
     <jersey.version>1.17</jersey.version>
+    <!-- Used by sfc -->
     <jersey.client.version>1.17</jersey.client.version>
-    <jersey.server.version>1.17</jersey.server.version>
-    <jersey-servlet.version>1.17</jersey-servlet.version>
-    <jersey2.publisher.version>4.0</jersey2.publisher.version>
-    <jersey2.version>2.8</jersey2.version>
-    <jettison.version>1.3.3</jettison.version>
-    <jolokia.version>1.1.4</jolokia.version>
-    <jsonassert.version>1.2.3</jsonassert.version>
-    <jsr305.api.version>2.0.3</jsr305.api.version>
-    <jsr311.api.version>1.1.1</jsr311.api.version>
-    <jsr311.v2.api.version>2.0</jsr311.v2.api.version>
+
+    <!-- New packages for jersey migration 1.17 to 2.8 -->
+    <!-- appache.geronimo.bundle for DocGen -->
+    <!-- Used by aaa, iotdm, netconf, ovsdb, sfc -->
+    <org.json.version>20131018</org.json.version>
+
+    <!-- Used by sfc -->
+    <jettison.version>1.3.7</jettison.version>
+    <!-- Used by persistence -->
+    <jsr305.api.version>3.0.0</jsr305.api.version>
+    <!-- Need to stick to JUnit 4.11 until
+         https://github.com/jayway/powermock/issues/560 is fixed (either in
+         PowerMock or with a new JUnit release) -->
+    <!-- Used everywhere -->
     <junit.version>4.11</junit.version>
-    <logback.version>1.0.9</logback.version>
+    <!-- Used by coretutorials, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
+    <logback.version>1.1.3</logback.version>
+    <!-- Used by nic, sfc, sxp, tsdr -->
     <mockito.version>1.9.5</mockito.version>
-    <netty.version>4.0.23.Final</netty.version>
-    <osgi.compendium.version>5.0.0</osgi.compendium.version>
+    <!-- Used by bgpcep, netconf, ovsdb, sxp; see also opendove, toolkit -->
+    <netty.version>4.0.30.Final</netty.version>
+    <!-- Used by alto, controller, neutron, sfc, snbi; see also dlux, toolkit, tsdr -->
     <osgi.core.version>5.0.0</osgi.core.version>
-    <org.json.version>20131018</org.json.version>
-    <slf4j.version>1.7.2</slf4j.version>
-    <spifly.version>1.0.0</spifly.version>
-    <spring-osgi.version>1.2.1</spring-osgi.version>
-    <spring-security-karaf.version>3.1.4.RELEASE</spring-security-karaf.version>
-    <spring-security.version>3.1.3.RELEASE</spring-security.version>
-    <spring.version>3.1.3.RELEASE</spring.version>
-    <txw2.version>20110809</txw2.version>
+    <!-- Used by openflowjava, persistence, sfc, snmp4sdn, sxp; see also affinity, toolkit -->
+    <slf4j.version>1.7.12</slf4j.version>
+    <!-- Used in integration/distribution; see also affinity, snmp4sdn, toolkit, tsdr, ttp -->
+    <spring.version>3.2.14.RELEASE</spring.version>
+    <!-- Used in odlparent only; see also affinity, snmp4sdn -->
     <url.version>1.5.0</url.version>
-    <virgo.version>3.6.0.RELEASE</virgo.version>
 
     <!-- Default Sonar configuration -->
     <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>
+    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
   </properties>
 
   <dependencyManagement>
@@ -172,7 +174,7 @@
       <dependency>
          <groupId>org.skyscreamer</groupId>
          <artifactId>jsonassert</artifactId>
-         <version>${jsonassert.version}</version>
+         <version>1.2.3</version>
          <scope>test</scope>
       </dependency>
       <dependency>
@@ -241,9 +243,9 @@
         <version>${guava.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.eclipse.xtend</groupId>
-        <artifactId>org.eclipse.xtend.lib</artifactId>
-        <version>${xtend.version}</version>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -261,6 +263,34 @@
         <version>${commons.codec.version}</version>
       </dependency>
       <!-- Jersey for JAXRS -->
+      <dependency>
+        <groupId>javax.ws.rs</groupId>
+        <artifactId>javax.ws.rs-api</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+        <artifactId>jersey-guava</artifactId>
+        <version>2.8</version>
+      </dependency>
+      <dependency>
+        <groupId>com.eclipsesource.jaxrs</groupId>
+        <artifactId>jersey-all</artifactId>
+        <version>2.8</version>
+      </dependency>
+
+      <!-- servlet 3.x support -->
+      <dependency>
+        <groupId>org.glassfish.jersey.containers</groupId>
+        <artifactId>jersey-container-servlet</artifactId>
+        <version>2.8</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>json</artifactId>
+        <version>20090211_1</version>
+      </dependency>
+      <!-- FIXME : remove all dependencies for jersey 1.7 -->
       <dependency>
         <groupId>com.sun.jersey</groupId>
         <artifactId>jersey-core</artifactId>
@@ -279,8 +309,9 @@
       <dependency>
         <groupId>org.opendaylight.controller.thirdparty</groupId>
         <artifactId>com.sun.jersey.jersey-servlet</artifactId>
-        <version>${jersey-servlet.version}</version>
+        <version>1.17</version>
       </dependency>
+
       <!-- Plugin integration -->
       <dependency>
         <groupId>org.sonatype.plexus</groupId>
@@ -312,11 +343,11 @@
         <artifactId>jackson-datatype-json-org</artifactId>
         <version>${jackson.version}</version>
       </dependency>
-
+      <!-- TODO do we really need resteasy ? -->
       <dependency>
           <groupId>org.jboss.resteasy</groupId>
           <artifactId>jaxrs-api</artifactId>
-          <version>${jaxrs-api.version}</version>
+          <version>3.0.4.Final</version>
       </dependency>
 
       <dependency>
@@ -337,12 +368,12 @@
       <dependency>
         <groupId>com.sun.xml.txw2</groupId>
         <artifactId>txw2</artifactId>
-        <version>${txw2.version}</version>
+        <version>20110809</version>
       </dependency>
       <dependency>
         <groupId>com.github.romix</groupId>
         <artifactId>java-concurrent-hash-trie-map</artifactId>
-        <version>${ctrie.version}</version>
+        <version>0.2.23</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
@@ -357,12 +388,12 @@
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
-        <version>${commons.fileupload.version}</version>
+        <version>1.3.1</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>${commons.io.version}</version>
+        <version>2.4</version>
       </dependency>
       <dependency>
         <groupId>commons-net</groupId>
@@ -443,52 +474,57 @@
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.gemini.web.core</artifactId>
-        <version>${geminiweb.version}</version>
+        <version>2.2.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.gemini.web.extender</artifactId>
-        <version>${geminiweb.version}</version>
+        <version>2.2.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.gemini.web.tomcat</artifactId>
-        <version>${geminiweb.version}</version>
+        <version>2.2.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.virgo.kernel.equinox.extensions</artifactId>
-        <version>${virgo.version}</version>
+        <version>3.6.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.virgo.util.common</artifactId>
-        <version>${virgo.version}</version>
+        <version>3.6.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.virgo.util.io</artifactId>
-        <version>${virgo.version}</version>
+        <version>3.6.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.virgo.util.math</artifactId>
-        <version>${virgo.version}</version>
+        <version>3.6.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.virgo.util.osgi</artifactId>
-        <version>${virgo.version}</version>
+        <version>3.6.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.virgo.util.osgi.manifest</artifactId>
-        <version>${virgo.version}</version>
+        <version>3.6.0.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>geminiweb</groupId>
         <artifactId>org.eclipse.virgo.util.parser.manifest</artifactId>
-        <version>${virgo.version}</version>
+        <version>3.6.0.RELEASE</version>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-all</artifactId>
+        <version>${netty.version}</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
@@ -524,7 +560,7 @@
       <dependency>
         <groupId>javax.ws.rs</groupId>
         <artifactId>jsr311-api</artifactId>
-        <version>${jsr311.api.version}</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>orbit</groupId>
@@ -551,6 +587,11 @@
         <artifactId>javax.mail.glassfish</artifactId>
         <version>1.4.1.v201108011116</version>
       </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.0.1</version>
+      </dependency>
       <dependency>
         <groupId>orbit</groupId>
         <artifactId>javax.servlet.jsp.jstl</artifactId>
@@ -614,7 +655,7 @@
       <dependency>
         <groupId>org.aopalliance</groupId>
         <artifactId>com.springsource.org.aopalliance</artifactId>
-        <version>${aopalliance.version}</version>
+        <version>1.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -624,18 +665,18 @@
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
-        <version>${felix.dependencymanager.shell.version}</version>
+        <version>3.0.1</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.fileinstall</artifactId>
-        <version>${felix.fileinstall.version}</version>
+        <version>3.1.6</version>
       </dependency>
       <!-- felix webconsole -->
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.webconsole</artifactId>
-        <version>${felix.webconsole.version}</version>
+        <version>4.2.0</version>
         <!-- the all bundle includes all the necessary plugins -->
         <classifier>all</classifier>
       </dependency>
@@ -654,6 +695,11 @@
         <artifactId>enunciate-core-annotations</artifactId>
         <version>${enunciate.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.webcohesion.enunciate</groupId>
+        <artifactId>enunciate-core-annotations</artifactId>
+        <version>2.1.1</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
@@ -680,6 +726,11 @@
         <artifactId>org.eclipse.persistence.moxy</artifactId>
         <version>${eclipse.persistence.version}</version>
       </dependency>
+      <dependency>
+        <groupId>javax.validation</groupId>
+        <artifactId>validation-api</artifactId>
+        <version>1.1.0.Final</version>
+      </dependency>
       <dependency>
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
@@ -693,7 +744,7 @@
       <dependency>
         <groupId>org.jolokia</groupId>
         <artifactId>jolokia-osgi</artifactId>
-        <version>${jolokia.version}</version>
+        <version>1.3.1</version>
       </dependency>
       <dependency>
         <groupId>org.json</groupId>
@@ -703,17 +754,19 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
-        <version>${osgi.compendium.version}</version>
+        <version>5.0.0</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.core</artifactId>
         <version>${osgi.core.version}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-all</artifactId>
-        <version>4.1</version>
+        <version>5.0.4</version>
       </dependency>
       <!-- Visual VM hook -->
       <dependency>
@@ -723,74 +776,59 @@
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.aop</artifactId>
+        <artifactId>spring-aop</artifactId>
         <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.asm</artifactId>
+        <artifactId>spring-beans</artifactId>
         <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.beans</artifactId>
+        <artifactId>spring-context</artifactId>
         <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.context</artifactId>
+        <artifactId>spring-core</artifactId>
         <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.context.support</artifactId>
+        <artifactId>spring-expression</artifactId>
         <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.core</artifactId>
+        <artifactId>spring-tx</artifactId>
         <version>${spring.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.expression</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.transaction</artifactId>
-        <version>${spring-security.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.web</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.web.servlet</artifactId>
+        <artifactId>spring-web</artifactId>
         <version>${spring.version}</version>
       </dependency>
       <!-- Spring security -->
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-config</artifactId>
-        <version>${spring-security.version}</version>
+        <version>3.2.8.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-core</artifactId>
-        <version>${spring-security.version}</version>
+        <version>3.2.8.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-taglibs</artifactId>
-        <version>${spring-security.version}</version>
+        <version>3.2.8.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.security</groupId>
         <artifactId>spring-security-web</artifactId>
-        <version>${spring-security.version}</version>
+        <version>3.2.8.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>virgomirror</groupId>
@@ -839,71 +877,22 @@
       <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-mock</artifactId>
-        <version>${spring-osgi.version}</version>
+        <version>1.2.1</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>xmlunit</groupId>
         <artifactId>xmlunit</artifactId>
-        <version>1.5</version>
+        <version>1.6</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-servlets</artifactId>
+        <version>8.1.14.v20131031</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
-  <repositories>
-    <!-- OpenDayLight Repo Mirror -->
-    <repository>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>opendaylight-mirror</id>
-      <name>opendaylight-mirror</name>
-      <url>${nexusproxy}/groups/public/</url>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <!-- OpenDayLight Repo Mirror -->
-    <pluginRepository>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>opendaylight-mirror</id>
-      <name>opendaylight-mirror</name>
-      <url>${nexusproxy}/groups/public/</url>
-    </pluginRepository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <pluginRepository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>opendaylight-snapshot</id>
-      <name>opendaylight-snapshot</name>
-      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-    </pluginRepository>
-  </pluginRepositories>
 
   <build>
     <pluginManagement>
@@ -923,13 +912,48 @@
               <artifactId>checkstyle</artifactId>
               <version>${odl.checkstyle.version}</version>
             </dependency>
+            <dependency>
+              <groupId>org.opendaylight.odlparent</groupId>
+              <artifactId>odl-license</artifactId>
+              <version>0.0.1-SNAPSHOT</version>
+            </dependency>
           </dependencies>
           <configuration>
             <configLocation>odl_checks.xml</configLocation>
+            <!-- <sourceDirectory> is needed so that checkstyle ignores the
+                 generated sources directory -->
+            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+            <excludes>
+              org/opendaylight/yang/gen/**,
+              **/config/yang/**,
+              **/protobuff/messages/**,
+              **/thrift/gen/*.java
+            </excludes>
             <failsOnError>false</failsOnError>
             <consoleOutput>true</consoleOutput>
           </configuration>
           <executions>
+            <execution>
+              <id>check-license</id>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <phase>process-sources</phase>
+              <configuration>
+                <configLocation>check-license.xml</configLocation>
+                <includeResources>false</includeResources>
+                <includeTestResources>false</includeTestResources>
+                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                <excludes>
+                  org/opendaylight/yang/gen/**,
+                  **/config/yang/**,
+                  **/protobuff/messages/**,
+                  **/thrift/gen/*.java
+                </excludes>
+                <failsOnError>false</failsOnError>
+                <consoleOutput>true</consoleOutput>
+              </configuration>
+            </execution>
             <execution>
               <goals>
                 <goal>check</goal>
@@ -944,15 +968,11 @@
         </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>${maven.install.plugin.version}</version>
+          <version>2.5.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>${maven.deploy.plugin.version}</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.10</version>
+          <version>2.8.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
@@ -966,6 +986,11 @@
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>${failsafe.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-invoker-plugin</artifactId>
+          <version>2.0.0</version>
+        </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
           <version>${jar.plugin.version}</version>
@@ -973,26 +998,76 @@
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${maven.javadoc.version}</version>
+          <configuration>
+            <!-- Keep things quiet except for warnings/errors -->
+            <quiet>true</quiet>
+          </configuration>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
           <version>${maven.release.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.10</version>
+          <executions>
+            <execution>
+              <id>unpack-license</id>
+              <phase>generate-resources</phase>
+              <goals><goal>unpack</goal></goals>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>org.opendaylight.odlparent</groupId>
+                    <artifactId>odl-license</artifactId>
+                    <version>0.0.1-SNAPSHOT</version>
+                  </artifactItem>
+                </artifactItems>
+                <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                <excludes>META-INF/**</excludes>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>${maven.plugin.version}</version>
+        </plugin>
+
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
           <version>2.7</version>
         </plugin>
         <plugin>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>2.3</version>
+          <version>2.4.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>${siteplugin}</version>
+          <version>3.4</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>${maven.source.version}</version>
+          <version>2.4</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
@@ -1016,7 +1091,7 @@
         <plugin>
           <groupId>org.apache.servicemix.tooling</groupId>
           <artifactId>depends-maven-plugin</artifactId>
-          <version>${maven.depends.version}</version>
+          <version>1.2</version>
           <executions>
             <execution>
               <id>generate-depends-file</id>
@@ -1032,6 +1107,11 @@
           <artifactId>maven-enunciate-plugin</artifactId>
           <version>${enunciate.version}</version>
         </plugin>
+        <plugin>
+          <groupId>com.webcohesion.enunciate</groupId>
+          <artifactId>enunciate-maven-plugin</artifactId>
+          <version>2.1.1</version>
+        </plugin>
         <plugin>
           <groupId>org.codehaus.groovy.maven</groupId>
           <artifactId>gmaven-plugin</artifactId>
@@ -1065,7 +1145,59 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <execute></execute>
+                    <execute/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <versionRange>[1.0.0,)</versionRange>
+                    <goals>
+                      <goal>enforce</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <versionRange>[2.0.0,)</versionRange>
+                    <goals>
+                      <goal>check</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <versionRange>[2.10,)</versionRange>
+                    <goals>
+                      <goal>unpack</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute/>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.servicemix.tooling</groupId>
+                    <artifactId>depends-maven-plugin</artifactId>
+                    <versionRange>[1.2,)</versionRange>
+                    <goals>
+                      <goal>generate-depends-file</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -1073,25 +1205,93 @@
           </configuration>
         </plugin>
 
-        <plugin>
-          <groupId>org.eclipse.xtend</groupId>
-          <artifactId>xtend-maven-plugin</artifactId>
-          <version>${xtend.version}</version>
-        </plugin>
-
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
           <version>${jacoco.version}</version>
+          <configuration>
+            <!-- Note: This exclusion list should match <sonar.exclusions>
+                       property above -->
+            <excludes>
+              <exclude>**/gen/**</exclude>
+              <exclude>**/generated-sources/**</exclude>
+              <exclude>**/yang-gen/**</exclude>
+              <exclude>**/pax/**</exclude>
+            </excludes>
+          </configuration>
         </plugin>
 
         <plugin>
           <groupId>org.ops4j.pax.exam</groupId>
           <artifactId>maven-paxexam-plugin</artifactId>
-          <version>${paxexam.plugin.version}</version>
+          <version>1.2.4</version>
         </plugin>
       </plugins>
     </pluginManagement>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <version>3.1.1</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+
+      <!-- Jacoco / Sonar -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>pre-unit-test</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+            <configuration>
+              <destFile>${sonar.jacoco.reportPath}</destFile>
+            </configuration>
+          </execution>
+          <execution>
+            <id>post-unit-test</id>
+            <goals>
+              <goal>report</goal>
+            </goals>
+            <configuration>
+              <dataFile>${sonar.jacoco.reportPath}</dataFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
   <reporting>
@@ -1109,7 +1309,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
         <configuration>
           <effort>Max</effort>
           <threshold>Low</threshold>
@@ -1123,4 +1323,20 @@
       </plugin>
     </plugins>
   </reporting>
+
+  <!--
+    Maven Site Configuration
+
+    The following configuration is necessary for maven-site-plugin to
+    correctly identify the correct deployment path for OpenDaylight Maven
+    sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/${project.artifactId}/</url>
+    </site>
+  </distributionManagement>
 </project>