From ebfb63317c84ed53ce0cc57b4e7ddcaeafcb1cc3 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Mon, 7 Oct 2013 15:21:28 +0200 Subject: [PATCH] Reworked pom files Each pom (artifact) declares it's dependencies (internal and external) No dependencies declared at parent POM level, only dependency Management. Also moved the from distribution/opendaylight to the root pom.xml distribution/opendaylight now builds entirely from dependencies I have intentionally left some things in here I think are wrong, because the goal of this commit is to reproduce the existing build (which it does, I've checked). Subsequent commits will clean up other things. Change-Id: I358bdac1c0f6a59b37a418a811a30235967fdfdc Signed-off-by: Tony Tkacik --- opendaylight/appauth/pom.xml | 25 + opendaylight/arphandler/pom.xml | 4 + .../clustering/integrationtest/pom.xml | 44 + opendaylight/clustering/services/pom.xml | 10 +- .../services_implementation/pom.xml | 147 +- opendaylight/clustering/stub/pom.xml | 7 +- opendaylight/clustering/test/pom.xml | 33 + opendaylight/commons/integrationtest/pom.xml | 37 + opendaylight/commons/opendaylight/pom.xml | 1218 +++++++++-------- opendaylight/config/logback-config/pom.xml | 4 + opendaylight/config/pom.xml | 7 +- .../config/yang-jmx-generator-plugin/pom.xml | 4 + opendaylight/config/yang-test/pom.xml | 4 + .../configuration/implementation/pom.xml | 7 +- .../configuration/integrationtest/pom.xml | 42 + .../connectionmanager/implementation/pom.xml | 4 + .../it.implementation/pom.xml | 4 + .../distribution/opendaylight/pom.xml | 1039 ++++++++++++-- .../opendaylight/src/assemble/bin.xml | 39 +- opendaylight/distribution/sanitytest/pom.xml | 8 +- .../integrationtest/pom.xml | 33 + opendaylight/hosttracker/api/pom.xml | 7 +- .../hosttracker/implementation/pom.xml | 4 + .../hosttracker/integrationtest/pom.xml | 37 + opendaylight/hosttracker_new/api/pom.xml | 4 + .../hosttracker_new/implementation/pom.xml | 4 + opendaylight/logging/bridge/pom.xml | 14 +- opendaylight/md-sal/pom.xml | 12 +- opendaylight/md-sal/sal-binding-api/pom.xml | 7 +- opendaylight/md-sal/sal-common-api/pom.xml | 38 + .../neutron/implementation/pom.xml | 139 +- .../networkconfiguration/neutron/pom.xml | 121 +- .../northbound/bundlescanner/api/pom.xml | 13 +- .../bundlescanner/implementation/pom.xml | 53 +- opendaylight/northbound/commons/pom.xml | 52 +- .../northbound/flowprogrammer/pom.xml | 15 +- opendaylight/northbound/hosttracker/pom.xml | 4 + .../northbound/integrationtest/pom.xml | 13 +- .../networkconfiguration/neutron/pom.xml | 4 + opendaylight/northbound/staticrouting/pom.xml | 8 +- opendaylight/northbound/statistics/pom.xml | 4 + opendaylight/northbound/subnets/pom.xml | 6 + opendaylight/northbound/switchmanager/pom.xml | 8 +- opendaylight/northbound/topology/pom.xml | 19 +- .../protocol_plugins/openflow/pom.xml | 11 +- .../routing/dijkstra_implementation/pom.xml | 8 + opendaylight/sal/api/pom.xml | 20 +- opendaylight/sal/implementation/pom.xml | 12 +- opendaylight/samples/loadbalancer/pom.xml | 4 + opendaylight/security/pom.xml | 4 + .../statisticsmanager/implementation/pom.xml | 4 + .../statisticsmanager/integrationtest/pom.xml | 37 + opendaylight/switchmanager/api/pom.xml | 8 +- .../switchmanager/implementation/pom.xml | 8 + .../switchmanager/integrationtest/pom.xml | 37 + .../topologymanager/implementation/pom.xml | 12 +- opendaylight/usermanager/api/pom.xml | 39 + .../usermanager/implementation/pom.xml | 16 + opendaylight/web/devices/pom.xml | 4 + opendaylight/web/root/pom.xml | 12 + opendaylight/web/topology/pom.xml | 9 + opendaylight/web/troubleshoot/pom.xml | 5 + pom.xml | 110 ++ 63 files changed, 2662 insertions(+), 1004 deletions(-) create mode 100644 opendaylight/md-sal/sal-common-api/pom.xml diff --git a/opendaylight/appauth/pom.xml b/opendaylight/appauth/pom.xml index 2cfa45cc84..6f2e9ee1eb 100644 --- a/opendaylight/appauth/pom.xml +++ b/opendaylight/appauth/pom.xml @@ -62,5 +62,30 @@ junit junit + + equinoxSDK381 + javax.servlet + + + + org.springframework.security + spring-security-config + + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-web + + + org.springframework.security + spring-security-taglibs + + + org.springframework + org.springframework.transaction + diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml index dcd51f7627..367cf95c3a 100644 --- a/opendaylight/arphandler/pom.xml +++ b/opendaylight/arphandler/pom.xml @@ -78,5 +78,9 @@ sal 0.5.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/clustering/integrationtest/pom.xml b/opendaylight/clustering/integrationtest/pom.xml index 60dae9be35..e3d523484b 100644 --- a/opendaylight/clustering/integrationtest/pom.xml +++ b/opendaylight/clustering/integrationtest/pom.xml @@ -48,6 +48,50 @@ containermanager.it.implementation 0.5.1-SNAPSHOT + + junit + junit + + + org.ops4j.pax.exam + pax-exam-container-native + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.slf4j + log4j-over-slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.felix + org.apache.felix.dependencymanager.shell + + + eclipselink + javax.resource + diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml index 2abd794938..7eede83638 100644 --- a/opendaylight/clustering/services/pom.xml +++ b/opendaylight/clustering/services/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -18,6 +19,13 @@ 0.4.1-SNAPSHOT bundle + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.1_spec + + + diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml index 72d00dd7cd..60ee88c90d 100644 --- a/opendaylight/clustering/services_implementation/pom.xml +++ b/opendaylight/clustering/services_implementation/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -35,73 +36,73 @@ - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - - org.slf4j, - !org.apache.logging.log4j.*, - !bsh*, - !net.jcip.*, - !javax.swing, - !org.hornetq.*, - !org.jboss.*, - javax.transaction, - *, - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.sal.core - - - org.opendaylight.controller.clustering.services_implementation.internal.Activator - - - - - - - - - - * - - - infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper,narayana-jta;type=!pom;inline=false - - - true - - - ${project.basedir}/META-INF - - - - org.jacoco - jacoco-maven-plugin - - org.opendaylight.controller.* - - - - pre-test - - prepare-agent - - - - post-test - test - - report - - - - - + + + org.apache.felix + maven-bundle-plugin + ${bundle.plugin.version} + true + + + + org.slf4j, + !org.apache.logging.log4j.*, + !bsh*, + !net.jcip.*, + !javax.swing, + !org.hornetq.*, + !org.jboss.*, + javax.transaction, + *, + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.sal.core + + + org.opendaylight.controller.clustering.services_implementation.internal.Activator + + + + + + + + + + * + + + infinispan-core,jgroups,jboss-marshalling-river,jboss-marshalling,jboss-logging,staxmapper,narayana-jta;type=!pom;inline=false + + + true + + + ${project.basedir}/META-INF + + + + org.jacoco + jacoco-maven-plugin + + org.opendaylight.controller.* + + + + pre-test + + prepare-agent + + + + post-test + test + + report + + + + + org.apache.maven.plugins maven-enforcer-plugin ${enforcer.version} @@ -127,7 +128,7 @@ - + @@ -150,5 +151,13 @@ narayana-jta 4.17.7.Final + + equinoxSDK381 + org.apache.felix.gogo.runtime + + + junit + junit + diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/clustering/stub/pom.xml index 2bd7b2b066..607b48b3aa 100644 --- a/opendaylight/clustering/stub/pom.xml +++ b/opendaylight/clustering/stub/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -54,5 +55,9 @@ sal 0.5.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml index 99879c77dd..4c00ba0db1 100644 --- a/opendaylight/clustering/test/pom.xml +++ b/opendaylight/clustering/test/pom.xml @@ -59,5 +59,38 @@ sal 0.5.1-SNAPSHOT + + equinoxSDK381 + org.eclipse.osgi.services + + + equinoxSDK381 + org.eclipse.osgi + + + equinoxSDK381 + org.apache.felix.gogo.command + + + equinoxSDK381 + org.apache.felix.gogo.runtime + + + equinoxSDK381 + org.apache.felix.gogo.shell + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + junit + junit + test + diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/commons/integrationtest/pom.xml index 5308a09266..811f11fce7 100644 --- a/opendaylight/commons/integrationtest/pom.xml +++ b/opendaylight/commons/integrationtest/pom.xml @@ -54,6 +54,43 @@ org.apache.felix.gogo.shell 0.8.0.v201110170705 + + junit + junit + + + + org.ops4j.pax.exam + pax-exam-container-native + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.slf4j + log4j-over-slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index d8c4ccebb1..60d4266943 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 3.0 @@ -22,6 +23,11 @@ + + + 1.7 + 1.7 + 1.0-alpha-2 https://sonar.opendaylight.org/ dav:http://nexus.opendaylight.org/content/sites/site @@ -49,6 +55,7 @@ -Xmx1024m -XX:MaxPermSize=256m 0.5.8 14.0.1 + 5.0.0 2010.09.24.1 2010.09.24.1 2013.08.27.1 @@ -62,18 +69,591 @@ 2.3.7 4.8.1 0.2.0-SNAPSHOT + 0.5.8 + + 0.4.1-SNAPSHOT + 0.2.1-SNAPSHOT + 1.0-SNAPSHOT + 0.5.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.1.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.0.2-SNAPSHOT + 0.1.1-SNAPSHOT + 0.0.2-SNAPSHOT + 0.1.1-SNAPSHOT + 0.5.1-SNAPSHOT - - - - junit - junit - ${junit.version} - test - - - + + + + junit + junit + ${junit.version} + test + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + + + org.osgi + org.osgi.core + ${osgi.core.version} + provided + + + org.slf4j + slf4j-api + ${slf4j.version} + compile + + + org.slf4j + log4j-over-slf4j + ${slf4j.version} + + + ch.qos.logback + logback-core + ${logback.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + org.codehaus.jackson + jackson-mapper-asl + ${jackson.version} + + + org.codehaus.jackson + jackson-core-asl + ${jackson.version} + + + org.codehaus.jackson + jackson-jaxrs + ${jackson.version} + + + org.codehaus.jackson + jackson-xc + ${jackson.version} + + + org.codehaus.jettison + jettison + 1.3.3 + + + com.google.guava + guava + ${guava.version} + + + org.javassist + javassist + ${javassist.version} + + + commons-io + commons-io + 2.4 + + + commons-codec + commons-codec + 1.7 + + + org.apache.commons + commons-lang3 + ${commons.lang.version} + + + commons-fileupload + commons-fileupload + 1.2.2 + + + commons-net + commons-net + 3.0.1 + + + equinoxSDK381 + javax.servlet + 3.0.0.v201112011016 + + + equinoxSDK381 + javax.servlet.jsp + 2.2.0.v201112011158 + + + equinoxSDK381 + org.eclipse.equinox.ds + 1.4.0.v20120522-1841 + + + equinoxSDK381 + org.eclipse.equinox.util + 1.0.400.v20120522-2049 + + + equinoxSDK381 + org.eclipse.osgi.services + 3.3.100.v20120522-1822 + + + equinoxSDK381 + org.eclipse.osgi + 3.8.1.v20120830-144521 + + + equinoxSDK381 + org.apache.felix.gogo.command + 0.8.0.v201108120515 + + + equinoxSDK381 + org.apache.felix.gogo.runtime + 0.8.0.v201108120515 + + + equinoxSDK381 + org.apache.felix.gogo.shell + 0.8.0.v201110170705 + + + equinoxSDK381 + org.eclipse.equinox.cm + 1.0.400.v20120522-1841 + + + equinoxSDK381 + org.eclipse.equinox.console + 1.0.0.v20120522-1841 + + + equinoxSDK381 + org.eclipse.equinox.launcher + 1.3.0.v20120522-1813 + + + + geminiweb + org.eclipse.gemini.web.core + ${geminiweb.version} + + + geminiweb + org.eclipse.gemini.web.extender + ${geminiweb.version} + + + geminiweb + org.eclipse.gemini.web.tomcat + ${geminiweb.version} + + + geminiweb + org.eclipse.virgo.kernel.equinox.extensions + ${virgo.version} + + + geminiweb + org.eclipse.virgo.util.common + ${virgo.version} + + + geminiweb + org.eclipse.virgo.util.io + ${virgo.version} + + + geminiweb + org.eclipse.virgo.util.math + ${virgo.version} + + + geminiweb + org.eclipse.virgo.util.osgi + ${virgo.version} + + + geminiweb + org.eclipse.virgo.util.osgi.manifest + ${virgo.version} + + + geminiweb + org.eclipse.virgo.util.parser.manifest + ${virgo.version} + + + org.apache.felix + org.apache.felix.dependencymanager + 3.1.0 + + + org.apache.felix + org.apache.felix.dependencymanager.shell + 3.0.1 + + + com.google.code.gson + gson + 2.1 + compile + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.1_spec + 1.0.1.Final + + + org.apache.felix + org.apache.felix.fileinstall + 3.1.6 + + + virgomirror + org.eclipse.jdt.core.compiler.batch + 3.8.0.I20120518-2145 + + + eclipselink + javax.persistence + 2.0.4.v201112161009 + + + orbit + javax.activation + 1.1.0.v201211130549 + + + orbit + javax.annotation + 1.1.0.v201209060031 + + + orbit + javax.ejb + 3.1.1.v201204261316 + + + orbit + javax.el + 2.2.0.v201108011116 + + + orbit + javax.mail.glassfish + 1.4.1.v201108011116 + + + orbit + javax.xml.rpc + 1.1.0.v201005080400 + + + orbit + org.apache.catalina + 7.0.32.v201211201336 + + + orbit + org.apache.catalina.ha + 7.0.32.v201211201952 + + + orbit + org.apache.catalina.tribes + 7.0.32.v201211201952 + + + orbit + org.apache.coyote + 7.0.32.v201211201952 + + + orbit + org.apache.el + 7.0.32.v201211081135 + + + orbit + org.apache.jasper + 7.0.32.v201211201952 + + + orbit + org.apache.juli.extras + 7.0.32.v201211081135 + + + orbit + org.apache.tomcat.api + 7.0.32.v201211081135 + + + orbit + org.apache.tomcat.util + 7.0.32.v201211201952 + + + orbit + javax.servlet.jsp.jstl + 1.2.0.v201105211821 + + + orbit + javax.servlet.jsp.jstl.impl + 1.2.0.v201210211230 + + + eclipselink + javax.resource + 1.5.0.v200906010428 + + + + org.ops4j.pax.exam + pax-exam-container-native + ${exam.version} + test + + + org.ops4j.pax.exam + pax-exam-junit4 + ${exam.version} + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + ${exam.version} + test + + + org.ops4j.pax.url + pax-url-aether + ${url.version} + test + + + org.springframework + org.springframework.asm + ${spring.version} + + + org.springframework + org.springframework.aop + ${spring.version} + + + org.springframework + org.springframework.context + ${spring.version} + + + org.springframework + org.springframework.context.support + ${spring.version} + + + org.springframework + org.springframework.core + ${spring.version} + + + org.springframework + org.springframework.beans + ${spring.version} + + + org.springframework + org.springframework.expression + ${spring.version} + + + org.springframework + org.springframework.web + ${spring.version} + + + org.aopalliance + com.springsource.org.aopalliance + 1.0.0 + + + org.springframework + org.springframework.web.servlet + ${spring.version} + + + + org.springframework.security + spring-security-config + ${spring-security.version} + + + org.springframework.security + spring-security-core + ${spring-security.version} + + + org.springframework.security + spring-security-web + ${spring-security.version} + + + org.springframework.security + spring-security-taglibs + ${spring-security.version} + + + org.springframework + org.springframework.transaction + ${spring-security.version} + + + + org.ow2.chameleon.management + chameleon-mbeans + 1.0.0 + + + + com.sun.jersey + jersey-core + ${jersey.version} + + + com.sun.jersey + jersey-server + ${jersey.version} + + + com.sun.jersey + jersey-client + ${jersey.version} + + + com.sun.jersey + jersey-json + ${jersey.version} + + + org.ow2.asm + asm-all + 4.1 + + + org.eclipse.persistence + org.eclipse.persistence.moxy + 2.5.0 + + + org.eclipse.persistence + org.eclipse.persistence.core + 2.5.0 + + + org.eclipse.persistence + org.eclipse.persistence.antlr + 2.5.0 + + + + org.opendaylight.controller.thirdparty + net.sf.jung2 + 2.0.1 + + + org.opendaylight.controller.thirdparty + org.openflow.openflowj + 1.0.2 + + + org.opendaylight.controller.thirdparty + com.sun.jersey.jersey-servlet + 1.17 + + + org.opendaylight.controller.thirdparty + org.apache.catalina.filters.CorsFilter + 7.0.42 + + + + org.opendaylight.yangtools.model + ietf-inet-types + ${ietf-inet-types.version} + + + org.opendaylight.yangtools.model + ietf-yang-types + ${ietf-yang-types.version} + + + org.opendaylight.yangtools.model + opendaylight-l2-types + ${opendaylight-l2-types.version} + + + org.opendaylight.yangtools.model + yang-ext + ${yang-ext.version} + + + + + org.opendaylight.bgpcep + concepts + ${bgpcep.version} + + + org.opendaylight.bgpcep + util + ${bgpcep.version} + + + + + org.opendaylight.yangtools + yang-binding + ${yangtools.version} + + + org.opendaylight.yangtools + yang-common + ${yangtools.version} + + + org.opendaylight.yangtools + yang-data-api + ${yangtools.version} + + + org.opendaylight.yangtools + yang-data-util + ${yangtools.version} + + + org.opendaylight.yangtools + yang-model-api + ${yangtools.version} + + + + @@ -81,100 +661,19 @@ maven repo1 http://repo1.maven.org/maven2 + + opendaylight-release + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + opendaylight-snapshot + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + - - notduringrelease - - - !DOINGRELEASE - - - - - - - org.opendaylight.yangtools - yang-binding - ${yang.version} - - - org.opendaylight.yangtools - yang-common - ${yang.version} - - - org.opendaylight.yangtools - yang-data-api - ${yang.version} - - - org.opendaylight.yangtools - yang-model-api - ${yang.version} - - - org.opendaylight.yangtools - yang-data-util - ${yang.version} - - - - - - org.opendaylight.yangtools.model - ietf-inet-types - ${ietf-inet-types.version} - - - org.opendaylight.yangtools.model - ietf-yang-types - ${ietf-yang-types.version} - - - org.opendaylight.yangtools.model - ietf-yang-types - ${ietf-yang-types.version} - - - org.opendaylight.yangtools.model - opendaylight-l2-types - ${opendaylight-l2-types.version} - - - org.opendaylight.yangtools.model - yang-ext - ${yang-ext.version} - - - - - - com.google.guava - guava - ${guava.version} - - - org.javassist - javassist - ${javassist.version} - - - org.opendaylight.bgpcep - concepts - ${bgpcep.version} - - - org.opendaylight.bgpcep - util - ${bgpcep.version} - - - - ${project.version} - - viewbuild @@ -252,7 +751,7 @@ false - true + true @@ -262,8 +761,8 @@ ops4j-releases ${nexusproxy}/repositories/ops4j-releases/ - + thirdparty thirdparty @@ -418,13 +917,13 @@ org.apache.maven.plugins maven-checkstyle-plugin ${checkstyle.version} - - - org.opendaylight.controller - checkstyle - 0.0.2-SNAPSHOT - - + + + org.opendaylight.controller + checkstyle + 0.0.2-SNAPSHOT + + process-sources @@ -574,15 +1073,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - 1.6 - 1.6 - - org.apache.maven.plugins maven-javadoc-plugin @@ -622,491 +1112,5 @@ - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - org.codehaus.jackson - jackson-mapper-asl - ${jackson.version} - - - org.codehaus.jackson - jackson-core-asl - ${jackson.version} - - - org.codehaus.jackson - jackson-jaxrs - ${jackson.version} - - - org.codehaus.jackson - jackson-xc - ${jackson.version} - - - org.codehaus.jettison - jettison - 1.3.3 - - - commons-io - commons-io - 2.4 - - - commons-codec - commons-codec - 1.7 - - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - - commons-fileupload - commons-fileupload - 1.2.2 - - - commons-net - commons-net - 3.0.1 - - - equinoxSDK381 - javax.servlet - 3.0.0.v201112011016 - - - equinoxSDK381 - javax.servlet.jsp - 2.2.0.v201112011158 - - - equinoxSDK381 - org.eclipse.equinox.ds - 1.4.0.v20120522-1841 - - - equinoxSDK381 - org.eclipse.equinox.util - 1.0.400.v20120522-2049 - - - equinoxSDK381 - org.eclipse.osgi.services - 3.3.100.v20120522-1822 - - - equinoxSDK381 - org.eclipse.osgi - 3.8.1.v20120830-144521 - - - equinoxSDK381 - org.apache.felix.gogo.command - 0.8.0.v201108120515 - - - equinoxSDK381 - org.apache.felix.gogo.runtime - 0.8.0.v201108120515 - - - equinoxSDK381 - org.apache.felix.gogo.shell - 0.8.0.v201110170705 - - - equinoxSDK381 - org.eclipse.equinox.cm - 1.0.400.v20120522-1841 - - - equinoxSDK381 - org.eclipse.equinox.console - 1.0.0.v20120522-1841 - - - equinoxSDK381 - org.eclipse.equinox.launcher - 1.3.0.v20120522-1813 - - - - geminiweb - org.eclipse.gemini.web.core - ${geminiweb.version} - - - geminiweb - org.eclipse.gemini.web.extender - ${geminiweb.version} - - - geminiweb - org.eclipse.gemini.web.tomcat - ${geminiweb.version} - - - geminiweb - org.eclipse.virgo.kernel.equinox.extensions - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.common - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.io - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.math - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.osgi - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.osgi.manifest - ${virgo.version} - - - geminiweb - org.eclipse.virgo.util.parser.manifest - ${virgo.version} - - - org.apache.felix - org.apache.felix.dependencymanager - 3.1.0 - - - org.apache.felix - org.apache.felix.dependencymanager.shell - 3.0.1 - - - com.google.code.gson - gson - 2.1 - compile - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.1_spec - 1.0.1.Final - - - org.apache.felix - org.apache.felix.fileinstall - 3.1.6 - - - org.apache.commons - commons-lang3 - ${commons.lang.version} - - - virgomirror - org.eclipse.jdt.core.compiler.batch - 3.8.0.I20120518-2145 - - - eclipselink - javax.persistence - 2.0.4.v201112161009 - - - orbit - javax.activation - 1.1.0.v201211130549 - - - orbit - javax.annotation - 1.1.0.v201209060031 - - - orbit - javax.ejb - 3.1.1.v201204261316 - - - orbit - javax.el - 2.2.0.v201108011116 - - - orbit - javax.mail.glassfish - 1.4.1.v201108011116 - - - orbit - javax.xml.rpc - 1.1.0.v201005080400 - - - orbit - org.apache.catalina - 7.0.32.v201211201336 - - - orbit - org.apache.catalina.ha - 7.0.32.v201211201952 - - - orbit - org.apache.catalina.tribes - 7.0.32.v201211201952 - - - orbit - org.apache.coyote - 7.0.32.v201211201952 - - - orbit - org.apache.el - 7.0.32.v201211081135 - - - orbit - org.apache.jasper - 7.0.32.v201211201952 - - - orbit - org.apache.juli.extras - 7.0.32.v201211081135 - - - orbit - org.apache.tomcat.api - 7.0.32.v201211081135 - - - orbit - org.apache.tomcat.util - 7.0.32.v201211201952 - - - orbit - javax.servlet.jsp.jstl - 1.2.0.v201105211821 - - - orbit - javax.servlet.jsp.jstl.impl - 1.2.0.v201210211230 - - - eclipselink - javax.resource - 1.5.0.v200906010428 - - - - org.ops4j.pax.exam - pax-exam-container-native - ${exam.version} - test - - - org.ops4j.pax.exam - pax-exam-junit4 - ${exam.version} - test - - - org.ops4j.pax.exam - pax-exam-link-mvn - ${exam.version} - test - - - org.ops4j.pax.url - pax-url-aether - ${url.version} - test - - - org.springframework - org.springframework.asm - ${spring.version} - - - org.springframework - org.springframework.aop - ${spring.version} - - - org.springframework - org.springframework.context - ${spring.version} - - - org.springframework - org.springframework.context.support - ${spring.version} - - - org.springframework - org.springframework.core - ${spring.version} - - - org.springframework - org.springframework.beans - ${spring.version} - - - org.springframework - org.springframework.expression - ${spring.version} - - - org.springframework - org.springframework.web - ${spring.version} - - - org.aopalliance - com.springsource.org.aopalliance - 1.0.0 - - - org.springframework - org.springframework.web.servlet - ${spring.version} - - - - org.springframework.security - spring-security-config - ${spring-security.version} - - - org.springframework.security - spring-security-core - ${spring-security.version} - - - org.springframework.security - spring-security-web - ${spring-security.version} - - - org.springframework.security - spring-security-taglibs - ${spring-security.version} - - - org.springframework - org.springframework.transaction - ${spring-security.version} - - - - org.ow2.chameleon.management - chameleon-mbeans - 1.0.0 - - - - com.sun.jersey - jersey-core - ${jersey.version} - - - com.sun.jersey - jersey-server - ${jersey.version} - - - com.sun.jersey - jersey-client - ${jersey.version} - - - com.sun.jersey - jersey-json - ${jersey.version} - - - org.ow2.asm - asm-all - 4.1 - - - org.eclipse.persistence - org.eclipse.persistence.moxy - 2.5.0 - - - org.eclipse.persistence - org.eclipse.persistence.core - 2.5.0 - - - org.eclipse.persistence - org.eclipse.persistence.antlr - 2.5.0 - - - - org.opendaylight.controller.thirdparty - net.sf.jung2 - 2.0.1 - - - org.opendaylight.controller.thirdparty - org.openflow.openflowj - 1.0.2 - - - org.opendaylight.controller.thirdparty - com.sun.jersey.jersey-servlet - 1.17 - - - org.opendaylight.controller.thirdparty - org.apache.catalina.filters.CorsFilter - 7.0.42 - diff --git a/opendaylight/config/logback-config/pom.xml b/opendaylight/config/logback-config/pom.xml index 6b79e7cd27..697c3a258d 100644 --- a/opendaylight/config/logback-config/pom.xml +++ b/opendaylight/config/logback-config/pom.xml @@ -77,6 +77,10 @@ 0.2.0-SNAPSHOT test + + org.apache.commons + commons-lang3 + diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 3ebfad3f30..6484c30274 100755 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.controller commons.opendaylight - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT ../commons/opendaylight @@ -40,8 +40,9 @@ 0.6.2.201302030002 1.7.2 1.1.1 - 0.5.7-SNAPSHOT - 0.5.7-SNAPSHOT + 5.0.0 + 0.5.9-SNAPSHOT + 0.6.0-SNAPSHOT ${project.build.directory}/generated-sources/config diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml index b69ce03144..1079ce9fd7 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml +++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml @@ -78,6 +78,10 @@ 0.2.0-SNAPSHOT test + + org.apache.commons + commons-lang3 + diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml index 50c91883ee..626032f195 100644 --- a/opendaylight/config/yang-test/pom.xml +++ b/opendaylight/config/yang-test/pom.xml @@ -23,6 +23,10 @@ org.slf4j slf4j-api + + org.opendaylight.yangtools.model + ietf-inet-types + ${project.artifactId} diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml index fa617348d3..498b3d4e93 100644 --- a/opendaylight/configuration/implementation/pom.xml +++ b/opendaylight/configuration/implementation/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -63,5 +64,9 @@ sal 0.5.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/configuration/integrationtest/pom.xml b/opendaylight/configuration/integrationtest/pom.xml index 5d1e9c0346..dc080cd03e 100644 --- a/opendaylight/configuration/integrationtest/pom.xml +++ b/opendaylight/configuration/integrationtest/pom.xml @@ -92,5 +92,47 @@ topologymanager 0.4.1-SNAPSHOT + + junit + junit + test + + + + org.ops4j.pax.exam + pax-exam-container-native + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.slf4j + log4j-over-slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + eclipselink + javax.resource + diff --git a/opendaylight/connectionmanager/implementation/pom.xml b/opendaylight/connectionmanager/implementation/pom.xml index c3bd479afa..58b21eccb8 100644 --- a/opendaylight/connectionmanager/implementation/pom.xml +++ b/opendaylight/connectionmanager/implementation/pom.xml @@ -71,5 +71,9 @@ sal.connection 0.1.1-SNAPSHOT + + equinoxSDK381 + org.eclipse.osgi + diff --git a/opendaylight/containermanager/it.implementation/pom.xml b/opendaylight/containermanager/it.implementation/pom.xml index fe2ef876d7..3b86a797ca 100644 --- a/opendaylight/containermanager/it.implementation/pom.xml +++ b/opendaylight/containermanager/it.implementation/pom.xml @@ -69,5 +69,9 @@ sal 0.5.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index cdba77ae29..0bb4088855 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -25,120 +25,948 @@ !DOINGRELEASE - - - ../../md-sal - ../../config - + + + + + + org.opendaylight.controller + sal-common + ${mdsal.version} + + + org.opendaylight.controller + sal-common-util + ${mdsal.version} + + + org.opendaylight.controller + sal-core-api + ${mdsal.version} + + + org.opendaylight.controller + sal-broker-impl + ${mdsal.version} + + + org.opendaylight.controller + sal-core-spi + ${mdsal.version} + + + org.opendaylight.controller + sal-binding-api + ${mdsal.version} + + + org.opendaylight.controller + sal-binding-broker-impl + ${mdsal.version} + + + org.opendaylight.controller + sal-compability + ${mdsal.version} + + + org.opendaylight.controller + sal-connector-api + ${mdsal.version} + + + org.opendaylight.controller + sal-rest-connector + ${mdsal.version} + + + org.opendaylight.controller.model + model-inventory + ${mdsal.version} + + + org.opendaylight.controller.model + model-flow-base + ${mdsal.version} + + + org.opendaylight.controller.model + model-flow-service + ${mdsal.version} + + + org.opendaylight.controller.model + model-flow-statistics + ${mdsal.version} + + + + org.opendaylight.controller + concepts + ${concepts.version} + + + + + org.opendaylight.controller + config-api + ${config.version} + + + org.opendaylight.controller + config-manager + ${config.version} + + + org.opendaylight.controller + config-util + ${config.version} + + + org.opendaylight.controller + yang-jmx-generator + ${config.version} + + + org.opendaylight.controller + yang-jmx-generator-plugin + ${config.version} + + + org.opendaylight.controller + yang-jmx-generator-it + ${config.version} + + + org.opendaylight.controller + yang-store-api + ${config.version} + + + org.opendaylight.controller + yang-store-impl + ${config.version} + + + org.opendaylight.controller + yang-test + ${config.version} + + + org.opendaylight.controller + logback-config + ${config.version} + + distribution.opendaylight 0.1.1-SNAPSHOT pom - - ../../forwarding/staticrouting - ../../clustering/services - ../../clustering/services_implementation - ../../clustering/integrationtest - ../../clustering/stub - ../../clustering/test - ../../configuration/api - ../../configuration/implementation - ../../configuration/integrationtest - ../../routing/dijkstra_implementation - ../../arphandler - ../../forwardingrulesmanager/api - ../../forwardingrulesmanager/implementation - ../../forwardingrulesmanager/integrationtest - ../../hosttracker/api - ../../hosttracker/implementation - ../../hosttracker/integrationtest - ../../hosttracker_new/api - ../../hosttracker_new/implementation - ../../containermanager/api - ../../containermanager/implementation - ../../containermanager/it.implementation - ../../appauth - ../../switchmanager/api - ../../switchmanager/implementation - ../../switchmanager/integrationtest - ../../statisticsmanager/api - ../../statisticsmanager/implementation - ../../statisticsmanager/integrationtest - ../../topologymanager/implementation - ../../topologymanager/integrationtest - ../../usermanager/api - ../../usermanager/implementation - ../../connectionmanager/api - ../../connectionmanager/implementation - ../../security - - - - - - - ../../../third-party/commons/thirdparty + + + + org.opendaylight.controller + forwarding.staticrouting + ${controller.version} + + + org.opendaylight.controller + clustering.services + ${controller.version} + + + org.opendaylight.controller + clustering.services-implementation + ${controller.version} + + + org.opendaylight.controller + configuration + ${controller.version} + + + org.opendaylight.controller + configuration.implementation + ${controller.version} + + + org.opendaylight.controller + routing.dijkstra_implementation + ${controller.version} + + + org.opendaylight.controller + arphandler + ${controller.version} + + + org.opendaylight.controller + hosttracker + ${controller.version} + + + org.opendaylight.controller + hosttracker.implementation + ${controller.version} + + + org.opendaylight.controller + containermanager + ${containermanager.version} + + + org.opendaylight.controller + containermanager.implementation + ${containermanager.version} + + + org.opendaylight.controller + appauth + ${controller.version} + + + org.opendaylight.controller + switchmanager + ${switchmanager.api.version} + + + org.opendaylight.controller + switchmanager.implementation + ${controller.version} + + + org.opendaylight.controller + statisticsmanager + ${controller.version} + + + org.opendaylight.controller + statisticsmanager.implementation + ${controller.version} + + + org.opendaylight.controller + topologymanager + ${controller.version} + + + org.opendaylight.controller + usermanager + ${controller.version} + + + org.opendaylight.controller + usermanager.implementation + ${controller.version} + + + org.opendaylight.controller + connectionmanager + ${connectionmanager.version} + + + org.opendaylight.controller + connectionmanager.implementation + ${connectionmanager.version} + + + org.opendaylight.controller + security + ${controller.version} + + + org.opendaylight.controller + forwardingrulesmanager + ${controller.version} + + + org.opendaylight.controller + forwardingrulesmanager.implementation + ${controller.version} + - ../../sal/api - ../../sal/implementation - - ../../sal/connection/api - ../../sal/connection/implementation - ../../sal/networkconfiguration/api - ../../sal/networkconfiguration/implementation + + org.opendaylight.controller + sal + ${sal.version} + + + org.opendaylight.controller + sal.implementation + ${controller.version} + + + + + + org.opendaylight.controller + sal.connection + ${sal.connection.version} + + + org.opendaylight.controller + sal.connection.implementation + ${sal.connection.version} + + + org.opendaylight.controller + sal.networkconfiguration + ${sal.networkconfiguration.version} + + + org.opendaylight.controller + sal.networkconfiguration.implementation + ${sal.networkconfiguration.version} + - ../../web/root - ../../web/flows - ../../web/devices - ../../web/troubleshoot - ../../web/topology + + + org.opendaylight.controller + web + ${controller.version} + + + org.opendaylight.controller + flows.web + ${controller.version} + + + org.opendaylight.controller + devices.web + ${controller.version} + + + org.opendaylight.controller + troubleshoot.web + ${controller.version} + + + org.opendaylight.controller + topology.web + ${controller.version} + - ../../networkconfiguration/neutron - ../../networkconfiguration/neutron/implementation - ../../northbound/networkconfiguration/neutron + + + org.opendaylight.controller + networkconfig.neutron + ${controller.version} + + + org.opendaylight.controller + networkconfig.neutron.implementation + ${controller.version} + + + org.opendaylight.controller + networkconfig.neutron.northbound + ${controller.version} + - ../../northbound/commons - ../../northbound/bundlescanner/api - ../../northbound/bundlescanner/implementation - ../../northbound/topology - ../../northbound/staticrouting - ../../northbound/statistics - ../../northbound/flowprogrammer - ../../northbound/hosttracker - ../../northbound/subnets - ../../northbound/switchmanager - ../../northbound/containermanager - ../../northbound/networkconfiguration/bridgedomain - - - ../../northbound/integrationtest + + + org.opendaylight.controller + commons.northbound + ${controller.version} + + + org.opendaylight.controller + bundlescanner + ${controller.version} + + + org.opendaylight.controller + bundlescanner.implementation + ${controller.version} + + + org.opendaylight.controller + topology.northbound + ${controller.version} + + + org.opendaylight.controller + forwarding.staticrouting.northbound + ${controller.version} + + + org.opendaylight.controller + statistics.northbound + ${controller.version} + + + org.opendaylight.controller + flowprogrammer.northbound + ${controller.version} + + + org.opendaylight.controller + hosttracker.northbound + ${controller.version} + + + org.opendaylight.controller + subnets.northbound + ${controller.version} + + + org.opendaylight.controller + switchmanager.northbound + ${controller.version} + + + org.opendaylight.controller + containermanager.northbound + ${controller.version} + + + org.opendaylight.controller + networkconfig.bridgedomain.northbound + ${networkconfig.bridgedomain.northbound.version} + + - ../../logging/bridge + + + org.opendaylight.controller + logging.bridge + ${controller.version} + - ../../protocol_plugins/openflow - ../../protocol_plugins/stub - - - ../../samples/simpleforwarding - ../../samples/loadbalancer - ../../samples/northbound/loadbalancer - - - ../../commons/concepts - ../../commons/httpclient - ../../commons/integrationtest - ../../commons/checkstyle - ../../commons/opendaylight - ../../commons/parent - + + + org.opendaylight.controller + protocol_plugins.openflow + ${controller.version} + + + + + org.opendaylight.controller + samples.loadbalancer + ${controller.version} + + + org.opendaylight.controller + samples.loadbalancer.northbound + ${controller.version} + + + org.opendaylight.controller + samples.simpleforwarding + ${controller.version} + + + + + + + + org.slf4j + jcl-over-slf4j + + + org.osgi + org.osgi.core + provided + + + org.slf4j + slf4j-api + compile + + + org.slf4j + log4j-over-slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.codehaus.jackson + jackson-xc + + + org.codehaus.jettison + jettison + + + com.google.guava + guava + + + org.javassist + javassist + + + commons-io + commons-io + + + commons-codec + commons-codec + + + commons-fileupload + commons-fileupload + + + commons-net + commons-net + + + equinoxSDK381 + javax.servlet + + + equinoxSDK381 + javax.servlet.jsp + + + equinoxSDK381 + org.eclipse.equinox.ds + + + equinoxSDK381 + org.eclipse.equinox.util + + + equinoxSDK381 + org.eclipse.osgi.services + + + equinoxSDK381 + org.eclipse.osgi + + + equinoxSDK381 + org.apache.felix.gogo.command + + + equinoxSDK381 + org.apache.felix.gogo.runtime + + + equinoxSDK381 + org.apache.felix.gogo.shell + + + equinoxSDK381 + org.eclipse.equinox.cm + + + equinoxSDK381 + org.eclipse.equinox.console + + + equinoxSDK381 + org.eclipse.equinox.launcher + + + + geminiweb + org.eclipse.gemini.web.core + + + geminiweb + org.eclipse.gemini.web.extender + + + geminiweb + org.eclipse.gemini.web.tomcat + + + geminiweb + org.eclipse.virgo.kernel.equinox.extensions + + + geminiweb + org.eclipse.virgo.util.common + + + geminiweb + org.eclipse.virgo.util.io + + + geminiweb + org.eclipse.virgo.util.math + + + geminiweb + org.eclipse.virgo.util.osgi + + + geminiweb + org.eclipse.virgo.util.osgi.manifest + + + geminiweb + org.eclipse.virgo.util.parser.manifest + + + org.apache.felix + org.apache.felix.dependencymanager + + + org.apache.felix + org.apache.felix.dependencymanager.shell + + + com.google.code.gson + gson + compile + + + org.jboss.spec.javax.transaction + jboss-transaction-api_1.1_spec + + + org.apache.felix + org.apache.felix.fileinstall + + + org.apache.commons + commons-lang3 + + + virgomirror + org.eclipse.jdt.core.compiler.batch + + + eclipselink + javax.persistence + + + orbit + javax.activation + + + orbit + javax.annotation + + + orbit + javax.ejb + + + orbit + javax.el + + + orbit + javax.mail.glassfish + + + orbit + javax.xml.rpc + + + orbit + org.apache.catalina + + + orbit + org.apache.catalina.ha + + + orbit + org.apache.catalina.tribes + + + orbit + org.apache.coyote + + + orbit + org.apache.el + + + orbit + org.apache.jasper + + + orbit + org.apache.juli.extras + + + orbit + org.apache.tomcat.api + + + orbit + org.apache.tomcat.util + + + orbit + javax.servlet.jsp.jstl + + + orbit + javax.servlet.jsp.jstl.impl + + + eclipselink + javax.resource + + + + org.ops4j.pax.exam + pax-exam-container-native + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.springframework + org.springframework.asm + + + org.springframework + org.springframework.aop + + + org.springframework + org.springframework.context + + + org.springframework + org.springframework.context.support + + + org.springframework + org.springframework.core + + + org.springframework + org.springframework.beans + + + org.springframework + org.springframework.expression + + + org.springframework + org.springframework.web + + + org.aopalliance + com.springsource.org.aopalliance + + + org.springframework + org.springframework.web.servlet + + + + org.springframework.security + spring-security-config + + + org.springframework.security + spring-security-core + + + org.springframework.security + spring-security-web + + + org.springframework.security + spring-security-taglibs + + + org.springframework + org.springframework.transaction + + + + org.ow2.chameleon.management + chameleon-mbeans + + + + com.sun.jersey + jersey-core + ${jersey.version} + + + com.sun.jersey + jersey-server + ${jersey.version} + + + com.sun.jersey + jersey-client + + + com.sun.jersey + jersey-json + ${jersey.version} + + + org.ow2.asm + asm-all + + + org.eclipse.persistence + org.eclipse.persistence.moxy + + + org.eclipse.persistence + org.eclipse.persistence.core + + + org.eclipse.persistence + org.eclipse.persistence.antlr + + + + org.opendaylight.controller.thirdparty + net.sf.jung2 + + + org.opendaylight.controller.thirdparty + org.openflow.openflowj + + + org.opendaylight.controller.thirdparty + com.sun.jersey.jersey-servlet + + + org.opendaylight.controller.thirdparty + org.apache.catalina.filters.CorsFilter + + + + org.opendaylight.yangtools.model + ietf-inet-types + + + org.opendaylight.yangtools.model + ietf-yang-types + + + org.opendaylight.yangtools.model + opendaylight-l2-types + + + org.opendaylight.yangtools.model + yang-ext + + + + + org.opendaylight.bgpcep + concepts + + + org.opendaylight.bgpcep + util + + + + + org.opendaylight.controller + clustering.test + ${controller.version} + + + org.opendaylight.controller + commons.httpclient + ${commons.httpclient.version} + + + + + + org.opendaylight.controller.samples + sample-toaster + ${mdsal.version} + + + org.opendaylight.controller.samples + sample-toaster-consumer + ${mdsal.version} + + + org.opendaylight.controller.samples + sample-toaster-provider + ${mdsal.version} + + + org.opendaylight.controller.samples + sample-toaster-it + ${mdsal.version} + + + + + org.opendaylight.yangtools + yang-binding + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-data-util + + + org.opendaylight.yangtools + yang-model-api + + + + @@ -179,6 +1007,25 @@ + diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml index 92a718bac3..8fea175614 100644 --- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml +++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml @@ -7,42 +7,6 @@ zip false - - - - org.opendaylight.controller.thirdparty:org.openflow.openflowj - org.opendaylight.controller:clustering.stub - org.opendaylight.controller:logging.bridge - org.opendaylight.controller:protocol_plugins.stub - org.opendaylight.controller:*.integrationtest - org.opendaylight.controller:containermanager.it.implementation - org.opendaylight.controller:hosttracker_new - org.opendaylight.controller:hosttracker_new.implementation - org.opendaylight.controller:checkstyle - - - opendaylight/plugins - - ${module.groupId}.${module.artifactId}-${module.version}${dashClassifier?}.${module.extension} - - false - false - - - - - org.opendaylight.controller:logging.bridge - - - opendaylight/lib - - ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} - - false - false - - - opendaylight/plugins @@ -62,6 +26,8 @@ com.sun.jersey:jersey-core com.sun.jersey:jersey-json com.sun.jersey:jersey-server + org.opendaylight.controller:logging.bridge + org.opendaylight.controller:sanitytest ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} @@ -88,6 +54,7 @@ com.sun.jersey:jersey-core com.sun.jersey:jersey-json com.sun.jersey:jersey-server + org.opendaylight.controller:logging.bridge false diff --git a/opendaylight/distribution/sanitytest/pom.xml b/opendaylight/distribution/sanitytest/pom.xml index a0001f6db5..142268cf99 100644 --- a/opendaylight/distribution/sanitytest/pom.xml +++ b/opendaylight/distribution/sanitytest/pom.xml @@ -17,7 +17,13 @@ sanitytest 0.4.1-SNAPSHOT bundle - + + + org.osgi + org.osgi.core + provided + + diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml index 37c3a10afb..5762fadf68 100644 --- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml +++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml @@ -122,6 +122,39 @@ junit junit + + + org.ops4j.pax.exam + pax-exam-container-native + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.slf4j + log4j-over-slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml index 753d65c072..e8ccd1a7bc 100644 --- a/opendaylight/hosttracker/api/pom.xml +++ b/opendaylight/hosttracker/api/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -73,5 +74,9 @@ sal 0.5.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml index f7605afeea..c3b25a014e 100644 --- a/opendaylight/hosttracker/implementation/pom.xml +++ b/opendaylight/hosttracker/implementation/pom.xml @@ -144,5 +144,9 @@ hosttracker 0.4.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml index 834510536b..c308e720fc 100644 --- a/opendaylight/hosttracker/integrationtest/pom.xml +++ b/opendaylight/hosttracker/integrationtest/pom.xml @@ -94,6 +94,43 @@ topologymanager 0.4.1-SNAPSHOT + + junit + junit + + + + org.ops4j.pax.exam + pax-exam-container-native + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.slf4j + log4j-over-slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + diff --git a/opendaylight/hosttracker_new/api/pom.xml b/opendaylight/hosttracker_new/api/pom.xml index bfabd10e22..7fbcd9bc67 100644 --- a/opendaylight/hosttracker_new/api/pom.xml +++ b/opendaylight/hosttracker_new/api/pom.xml @@ -73,5 +73,9 @@ sal 0.5.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/hosttracker_new/implementation/pom.xml b/opendaylight/hosttracker_new/implementation/pom.xml index 62058b2d49..5222ecf601 100644 --- a/opendaylight/hosttracker_new/implementation/pom.xml +++ b/opendaylight/hosttracker_new/implementation/pom.xml @@ -125,5 +125,9 @@ hosttracker_new 0.4.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/logging/bridge/pom.xml index 91ee4324c3..3cdc01a409 100644 --- a/opendaylight/logging/bridge/pom.xml +++ b/opendaylight/logging/bridge/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -18,6 +19,17 @@ 0.4.1-SNAPSHOT bundle + + + org.slf4j + slf4j-api + + + equinoxSDK381 + org.eclipse.osgi + + + diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index d1e3c2c89b..1ef55c6acc 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -38,11 +38,11 @@ 1.7 1.7 - + 2.4.0 2.3.2 - + 1.7.2 0.5.8 @@ -85,10 +85,10 @@ opendaylight-snapshot ${nexusproxy}/repositories/opendaylight.snapshot/ - - thirdparty - thirdparty - ${nexusproxy}/repositories/thirdparty/ + + thirdparty + thirdparty + ${nexusproxy}/repositories/thirdparty/ central diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml index 1dae28fbb4..4c154c5d14 100644 --- a/opendaylight/md-sal/sal-binding-api/pom.xml +++ b/opendaylight/md-sal/sal-binding-api/pom.xml @@ -9,9 +9,9 @@ sal-binding-api bundle - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL @@ -28,6 +28,7 @@ sal-common 1.0-SNAPSHOT + org.osgi org.osgi.core diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml new file mode 100644 index 0000000000..2111dd7b32 --- /dev/null +++ b/opendaylight/md-sal/sal-common-api/pom.xml @@ -0,0 +1,38 @@ + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.0-SNAPSHOT + + sal-common-api + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + + + + org.opendaylight.yangtools + concepts + 0.1.0 + + + org.opendaylight.controller + sal-common + 1.0-SNAPSHOT + + + org.opendaylight.yangtools + yang-common + + + + org.osgi + org.osgi.core + 5.0.0 + + + diff --git a/opendaylight/networkconfiguration/neutron/implementation/pom.xml b/opendaylight/networkconfiguration/neutron/implementation/pom.xml index 123eb2d369..3b335463d9 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/pom.xml +++ b/opendaylight/networkconfiguration/neutron/implementation/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.opendaylight.controller @@ -6,10 +7,10 @@ 1.4.1-SNAPSHOT ../../../commons/opendaylight - - http://nexus.opendaylight.org/content - 1.26.2 - + + http://nexus.opendaylight.org/content + 1.26.2 + scm:git:ssh://git.opendaylight.org:29418/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git @@ -17,71 +18,75 @@ HEAD - - - - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - - website - ${sitedeploy} - - + + + + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + website + ${sitedeploy} + + org.opendaylight.controller networkconfig.neutron.implementation 0.4.1-SNAPSHOT bundle - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.apache.felix.dm, - org.apache.commons.net.util, - org.osgi.service.component, - org.opendaylight.controller.networkconfig.neutron, - org.slf4j, - javax.xml.bind.annotation - - - org.opendaylight.controller.networkconfig.neutron.implementation.Activator - - - ${project.basedir}/src/main/resources/META-INF - - - - - - - org.opendaylight.controller - clustering.services - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - networkconfig.neutron - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.1-SNAPSHOT - - + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.apache.felix.dm, + org.apache.commons.net.util, + org.osgi.service.component, + org.opendaylight.controller.networkconfig.neutron, + org.slf4j, + javax.xml.bind.annotation + + + org.opendaylight.controller.networkconfig.neutron.implementation.Activator + + + ${project.basedir}/src/main/resources/META-INF + + + + + + + org.osgi + org.osgi.core + + + org.opendaylight.controller + clustering.services + 0.4.1-SNAPSHOT + + + org.opendaylight.controller + networkconfig.neutron + 0.4.1-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.1-SNAPSHOT + + diff --git a/opendaylight/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/pom.xml index aac8e1e873..588a61653a 100644 --- a/opendaylight/networkconfiguration/neutron/pom.xml +++ b/opendaylight/networkconfiguration/neutron/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.opendaylight.controller @@ -6,72 +7,76 @@ 1.4.1-SNAPSHOT ../../commons/opendaylight - - http://nexus.opendaylight.org/content - 1.26.2 - + + http://nexus.opendaylight.org/content + 1.26.2 + scm:git:ssh://git.opendaylight.org:29418/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main HEAD - - - - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - - website - ${sitedeploy} - - + + + + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + website + ${sitedeploy} + + org.opendaylight.controller networkconfig.neutron 0.4.1-SNAPSHOT bundle - - - org.apache.felix - maven-bundle-plugin - 2.3.6 - true - - - - org.opendaylight.controller.clustering.services, - org.opendaylight.controller.sal.core, - org.opendaylight.controller.sal.utils, - org.apache.felix.dm, - org.apache.commons.net.util, - org.osgi.service.component, - org.slf4j, - javax.xml.bind.annotation - - - ${project.basedir}/src/main/resources/META-INF - - - - - - - org.opendaylight.controller - clustering.services - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.1-SNAPSHOT - - + + + org.apache.felix + maven-bundle-plugin + 2.3.6 + true + + + + org.opendaylight.controller.clustering.services, + org.opendaylight.controller.sal.core, + org.opendaylight.controller.sal.utils, + org.apache.felix.dm, + org.apache.commons.net.util, + org.osgi.service.component, + org.slf4j, + javax.xml.bind.annotation + + + ${project.basedir}/src/main/resources/META-INF + + + + + + + org.opendaylight.controller + clustering.services + 0.4.1-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.1-SNAPSHOT + + + commons-net + commons-net + + diff --git a/opendaylight/northbound/bundlescanner/api/pom.xml b/opendaylight/northbound/bundlescanner/api/pom.xml index 69672be126..44b48cb2eb 100644 --- a/opendaylight/northbound/bundlescanner/api/pom.xml +++ b/opendaylight/northbound/bundlescanner/api/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.opendaylight.controller @@ -20,7 +21,7 @@ - + org.apache.felix maven-bundle-plugin ${bundle.plugin.version} @@ -36,7 +37,7 @@ javax.xml.bind, - org.opendaylight.controller.northbound.bundlescanner + org.opendaylight.controller.northbound.bundlescanner @@ -44,4 +45,10 @@ + + + org.osgi + org.osgi.core + + diff --git a/opendaylight/northbound/bundlescanner/implementation/pom.xml b/opendaylight/northbound/bundlescanner/implementation/pom.xml index 0f86dd94d3..3f795889dd 100644 --- a/opendaylight/northbound/bundlescanner/implementation/pom.xml +++ b/opendaylight/northbound/bundlescanner/implementation/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.opendaylight.controller @@ -20,7 +21,7 @@ - + org.apache.felix maven-bundle-plugin ${bundle.plugin.version} @@ -40,7 +41,7 @@ javax.xml.bind, - org.opendaylight.controller.northbound.bundlescanner.internal.Activator + org.opendaylight.controller.northbound.bundlescanner.internal.Activator @@ -49,26 +50,30 @@ - - org.ow2.asm - asm-all - 4.1 - - - org.springframework.osgi - spring-osgi-mock - 1.2.1 - test - - - org.opendaylight.controller - bundlescanner - 0.4.1-SNAPSHOT - - - org.opendaylight.controller - sal - 0.5.1-SNAPSHOT - + + org.ow2.asm + asm-all + 4.1 + + + junit + junit + + + org.springframework.osgi + spring-osgi-mock + 1.2.1 + test + + + org.opendaylight.controller + bundlescanner + 0.4.1-SNAPSHOT + + + org.opendaylight.controller + sal + 0.5.1-SNAPSHOT + diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml index 84c3ff2e02..e6a2d155e9 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -68,7 +69,7 @@ switchmanager 0.5.1-SNAPSHOT - + org.opendaylight.controller sal 0.5.1-SNAPSHOT @@ -79,9 +80,50 @@ 0.4.1-SNAPSHOT - org.opendaylight.controller - bundlescanner - 0.4.1-SNAPSHOT + org.opendaylight.controller + bundlescanner + 0.4.1-SNAPSHOT + + + com.sun.jersey + jersey-core + + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-mapper-asl + + + org.codehaus.jackson + jackson-jaxrs + + + junit + junit + + + + com.sun.jersey + jersey-core + ${jersey.version} + + + com.sun.jersey + jersey-server + ${jersey.version} + + + com.sun.jersey + jersey-client + ${jersey.version} + + + com.sun.jersey + jersey-json + ${jersey.version} diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml index 549f3393c9..645b1b6ac6 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -96,9 +97,13 @@ ${enunciate.version} - org.opendaylight.controller - commons.northbound - 0.4.1-SNAPSHOT - + org.opendaylight.controller + commons.northbound + 0.4.1-SNAPSHOT + + + junit + junit + diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index 4792fbaa06..160bceaa58 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -101,5 +101,9 @@ enunciate-core-annotations ${enunciate.version} + + junit + junit + diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml index aaa50e482d..120036566d 100644 --- a/opendaylight/northbound/integrationtest/pom.xml +++ b/opendaylight/northbound/integrationtest/pom.xml @@ -678,6 +678,17 @@ jersey-json ${jersey.version} - + + eclipselink + javax.resource + + + org.opendaylight.controller.thirdparty + com.sun.jersey.jersey-servlet + + + org.opendaylight.controller.thirdparty + org.apache.catalina.filters.CorsFilter + diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/northbound/networkconfiguration/neutron/pom.xml index c40966b438..9a82afbb1a 100644 --- a/opendaylight/northbound/networkconfiguration/neutron/pom.xml +++ b/opendaylight/northbound/networkconfiguration/neutron/pom.xml @@ -116,5 +116,9 @@ org.eclipse.persistence.antlr 2.5.0 + + com.sun.jersey + jersey-core + diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index 525831f7e9..a869519c58 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -22,7 +23,6 @@ org.codehaus.enunciate maven-enunciate-plugin - ${enunciate.version} org.opendaylight.controller @@ -96,5 +96,9 @@ commons.northbound 0.4.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml index 084da6eb02..8df02c976b 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@ -104,5 +104,9 @@ enunciate-core-annotations ${enunciate.version} + + junit + junit + diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml index 75530e48a9..1ad3075b54 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@ -111,5 +111,11 @@ enunciate-core-annotations ${enunciate.version} + + junit + junit + ${junit.version} + test + diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml index 1b9c8344a8..bb3ca4bd42 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -106,5 +107,10 @@ enunciate-core-annotations ${enunciate.version} + + + junit + junit + diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml index 56d2928838..3b3abc3436 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -19,7 +20,7 @@ bundle - + org.codehaus.enunciate maven-enunciate-plugin @@ -33,11 +34,11 @@ - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - + org.apache.felix + maven-bundle-plugin + ${bundle.plugin.version} + true + @@ -99,5 +100,9 @@ topologymanager 0.4.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml index 5e0d8dae03..c7522c977f 100644 --- a/opendaylight/protocol_plugins/openflow/pom.xml +++ b/opendaylight/protocol_plugins/openflow/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -80,5 +81,13 @@ junit junit + + equinoxSDK381 + org.eclipse.osgi + + + org.opendaylight.controller.thirdparty + org.openflow.openflowj + diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml index 3689d9f124..0d77ec9fa5 100644 --- a/opendaylight/routing/dijkstra_implementation/pom.xml +++ b/opendaylight/routing/dijkstra_implementation/pom.xml @@ -75,5 +75,13 @@ junit junit + + org.opendaylight.controller.thirdparty + net.sf.jung2 + + + equinoxSDK381 + org.apache.felix.gogo.runtime + diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml index 87059531d2..1ac4e325af 100644 --- a/opendaylight/sal/api/pom.xml +++ b/opendaylight/sal/api/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -62,5 +63,22 @@ junit junit + + org.osgi + org.osgi.core + provided + + + org.slf4j + slf4j-api + + + org.apache.felix + org.apache.felix.dependencymanager + + + org.apache.commons + commons-lang3 + diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/sal/implementation/pom.xml index 10e89a7c9e..f260f315e0 100644 --- a/opendaylight/sal/implementation/pom.xml +++ b/opendaylight/sal/implementation/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -60,5 +61,14 @@ sal 0.5.1-SNAPSHOT + + equinoxSDK381 + org.eclipse.osgi + + + junit + junit + test + diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml index 5ca6cc190e..bbef893505 100644 --- a/opendaylight/samples/loadbalancer/pom.xml +++ b/opendaylight/samples/loadbalancer/pom.xml @@ -98,5 +98,9 @@ sal 0.5.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml index 3b9e29c055..2e7466daf0 100644 --- a/opendaylight/security/pom.xml +++ b/opendaylight/security/pom.xml @@ -60,5 +60,9 @@ sal 0.5.1-SNAPSHOT + + orbit + org.apache.catalina + diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml index b77eb75be0..b79051ce58 100644 --- a/opendaylight/statisticsmanager/implementation/pom.xml +++ b/opendaylight/statisticsmanager/implementation/pom.xml @@ -117,5 +117,9 @@ clustering.services 0.4.1-SNAPSHOT + + junit + junit + diff --git a/opendaylight/statisticsmanager/integrationtest/pom.xml b/opendaylight/statisticsmanager/integrationtest/pom.xml index ca2ec4eedc..acba080a99 100644 --- a/opendaylight/statisticsmanager/integrationtest/pom.xml +++ b/opendaylight/statisticsmanager/integrationtest/pom.xml @@ -98,6 +98,43 @@ topologymanager 0.4.1-SNAPSHOT + + junit + junit + + + + org.ops4j.pax.exam + pax-exam-container-native + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.slf4j + log4j-over-slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml index 6b84e156ba..8452c38218 100644 --- a/opendaylight/switchmanager/api/pom.xml +++ b/opendaylight/switchmanager/api/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -105,5 +106,10 @@ sal 0.5.1-SNAPSHOT + + junit + junit + test + diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml index 302652aa62..f701bf0bd3 100644 --- a/opendaylight/switchmanager/implementation/pom.xml +++ b/opendaylight/switchmanager/implementation/pom.xml @@ -121,5 +121,13 @@ statisticsmanager 0.4.1-SNAPSHOT + + junit + junit + + + equinoxSDK381 + org.apache.felix.gogo.runtime + diff --git a/opendaylight/switchmanager/integrationtest/pom.xml b/opendaylight/switchmanager/integrationtest/pom.xml index c3997a4188..37f68260bc 100644 --- a/opendaylight/switchmanager/integrationtest/pom.xml +++ b/opendaylight/switchmanager/integrationtest/pom.xml @@ -73,6 +73,43 @@ protocol_plugins.stub 0.4.1-SNAPSHOT + + junit + junit + + + + org.ops4j.pax.exam + pax-exam-container-native + test + + + org.ops4j.pax.exam + pax-exam-junit4 + test + + + org.ops4j.pax.exam + pax-exam-link-mvn + test + + + org.ops4j.pax.url + pax-url-aether + test + + + org.slf4j + log4j-over-slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + diff --git a/opendaylight/topologymanager/implementation/pom.xml b/opendaylight/topologymanager/implementation/pom.xml index f4f4924e44..a2fc91c29c 100755 --- a/opendaylight/topologymanager/implementation/pom.xml +++ b/opendaylight/topologymanager/implementation/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.opendaylight.controller @@ -77,5 +78,14 @@ switchmanager 0.5.1-SNAPSHOT + + junit + junit + test + + + equinoxSDK381 + org.eclipse.osgi + diff --git a/opendaylight/usermanager/api/pom.xml b/opendaylight/usermanager/api/pom.xml index 97121b348c..c301f8da2c 100644 --- a/opendaylight/usermanager/api/pom.xml +++ b/opendaylight/usermanager/api/pom.xml @@ -87,5 +87,44 @@ sal 0.5.1-SNAPSHOT + + junit + junit + + + org.springframework.security + spring-security-core + + + equinoxSDK381 + javax.servlet + 3.0.0.v201112011016 + + + + org.springframework.security + spring-security-config + ${spring-security.version} + + + org.springframework.security + spring-security-core + ${spring-security.version} + + + org.springframework.security + spring-security-web + ${spring-security.version} + + + org.springframework.security + spring-security-taglibs + ${spring-security.version} + + + org.springframework + org.springframework.transaction + ${spring-security.version} + diff --git a/opendaylight/usermanager/implementation/pom.xml b/opendaylight/usermanager/implementation/pom.xml index 9c9014e7a3..4eedf7eda9 100644 --- a/opendaylight/usermanager/implementation/pom.xml +++ b/opendaylight/usermanager/implementation/pom.xml @@ -91,5 +91,21 @@ sal 0.5.1-SNAPSHOT + + org.springframework.security + spring-security-web + + + equinoxSDK381 + org.eclipse.osgi + + + junit + junit + + + org.slf4j + jcl-over-slf4j + diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml index cabc9b5242..d894fd7d47 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/web/devices/pom.xml @@ -120,5 +120,9 @@ forwarding.staticrouting 0.4.1-SNAPSHOT + + org.codehaus.jackson + jackson-mapper-asl + diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml index 1ff86722a2..fa75580102 100644 --- a/opendaylight/web/root/pom.xml +++ b/opendaylight/web/root/pom.xml @@ -130,6 +130,18 @@ switchmanager 0.5.1-SNAPSHOT + + org.springframework + org.springframework.web + + + equinoxSDK381 + javax.servlet + + + com.google.code.gson + gson + junit junit diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml index 9a8c98929e..83d5c4547d 100644 --- a/opendaylight/web/topology/pom.xml +++ b/opendaylight/web/topology/pom.xml @@ -123,5 +123,14 @@ web 0.4.1-SNAPSHOT + + org.opendaylight.controller.thirdparty + net.sf.jung2 + + + junit + junit + test + diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml index c4d9d6b978..95941a3076 100644 --- a/opendaylight/web/troubleshoot/pom.xml +++ b/opendaylight/web/troubleshoot/pom.xml @@ -121,5 +121,10 @@ web 0.4.1-SNAPSHOT + + org.codehaus.jackson + jackson-mapper-asl + ${jackson.version} + diff --git a/pom.xml b/pom.xml index 7de8fc4c8c..d1b65d5902 100644 --- a/pom.xml +++ b/pom.xml @@ -23,5 +23,115 @@ opendaylight/distribution/opendaylight opendaylight/archetypes + opendaylight/forwarding/staticrouting + opendaylight/clustering/services + opendaylight/clustering/services_implementation + opendaylight/clustering/integrationtest + opendaylight/clustering/stub + opendaylight/clustering/test + opendaylight/configuration/api + opendaylight/configuration/implementation + opendaylight/configuration/integrationtest + opendaylight/routing/dijkstra_implementation + opendaylight/arphandler + opendaylight/forwardingrulesmanager/api + opendaylight/forwardingrulesmanager/implementation + opendaylight/forwardingrulesmanager/integrationtest + opendaylight/hosttracker/api + opendaylight/hosttracker/implementation + opendaylight/hosttracker/integrationtest + opendaylight/hosttracker_new/api + opendaylight/hosttracker_new/implementation + opendaylight/containermanager/api + opendaylight/containermanager/implementation + opendaylight/containermanager/it.implementation + opendaylight/appauth + opendaylight/switchmanager/api + opendaylight/switchmanager/implementation + opendaylight/switchmanager/integrationtest + opendaylight/statisticsmanager/api + opendaylight/statisticsmanager/implementation + opendaylight/statisticsmanager/integrationtest + opendaylight/topologymanager/implementation + opendaylight/topologymanager/integrationtest + opendaylight/usermanager/api + opendaylight/usermanager/implementation + opendaylight/connectionmanager/api + opendaylight/connectionmanager/implementation + opendaylight/security + + + + + + + + third-party/commons/thirdparty + + + opendaylight/sal/api + opendaylight/sal/implementation + + + opendaylight/sal/connection/api + opendaylight/sal/connection/implementation + opendaylight/sal/networkconfiguration/api + opendaylight/sal/networkconfiguration/implementation + + + opendaylight/md-sal + opendaylight/config + + + + opendaylight/web/root + opendaylight/web/flows + opendaylight/web/devices + opendaylight/web/troubleshoot + opendaylight/web/topology + + + opendaylight/networkconfiguration/neutron + opendaylight/networkconfiguration/neutron/implementation + opendaylight/northbound/networkconfiguration/neutron + + + opendaylight/northbound/commons + opendaylight/northbound/bundlescanner/api + opendaylight/northbound/bundlescanner/implementation + opendaylight/northbound/topology + opendaylight/northbound/staticrouting + opendaylight/northbound/statistics + opendaylight/northbound/flowprogrammer + opendaylight/northbound/hosttracker + opendaylight/northbound/subnets + opendaylight/northbound/switchmanager + opendaylight/northbound/containermanager + opendaylight/northbound/networkconfiguration/bridgedomain + + + opendaylight/northbound/integrationtest + + opendaylight/logging/bridge + + + opendaylight/protocol_plugins/openflow + opendaylight/protocol_plugins/stub + + + opendaylight/samples/simpleforwarding + opendaylight/samples/loadbalancer + opendaylight/samples/northbound/loadbalancer + + + + opendaylight/commons/concepts + opendaylight/commons/httpclient + opendaylight/commons/integrationtest + opendaylight/commons/checkstyle + opendaylight/commons/opendaylight + opendaylight/commons/parent -- 2.36.6