X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=9468133db820c05d29dc299de9d80e3f96c209ab;hb=c5966fe28f0ccdcc56c5690f138831778f007ea4;hp=cc256379fa8cd5bc866f29f9a0c0344ce61a7442;hpb=c2fd5f62f3b80a7e7b4b7e167349ede433e785d6;p=controller.git diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index cc256379fa..b9a6f38412 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -2,11 +2,13 @@ 4.0.0 - org.opendaylight.controller - commons.parent - 1.0.2-SNAPSHOT - ../parent + org.opendaylight.odlparent + odlparent + 1.4.2-SNAPSHOT + + + org.opendaylight.controller commons.opendaylight 1.4.2-SNAPSHOT pom @@ -15,14 +17,14 @@ - 2.3.2 + + 2.3.4 1.0.0 0.4.2-SNAPSHOT 0.0.1-SNAPSHOT 1.1.0 0.5.2-SNAPSHOT - 0.5.2-SNAPSHOT 4.1 1.50 @@ -30,7 +32,7 @@ 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT - 2.10 + 2.12 0.5.1-SNAPSHOT 0.4.3-SNAPSHOT 0.4.2-SNAPSHOT @@ -40,16 +42,27 @@ 7.0.32.v201211201336 7.0.32.v201211201952 7.0.32.v201211201952 - 0.0.3-SNAPSHOT - 1.7 7.0.32.v201211201952 7.0.32.v201211081135 + 7.0.32.v201211201952 + 7.0.32.v201211081135 + 7.0.32.v201211081135 + 7.0.32.v201211201952 + + 7.0.53.v201406061610 + 7.0.53.v201406070630 + 7.0.53.v201406070630 + 7.0.53.v201406070630 + 7.0.53.v201406060720 + 7.0.53.v201406070630 + 7.0.53.v201406060720 + 7.0.53.v201406060720 + 7.0.53.v201406070630 + + 0.0.3-SNAPSHOT 1.2.2 0.1.2-SNAPSHOT 2.4 - 7.0.32.v201211201952 - 7.0.32.v201211081135 - 3.1 3.1 0.0.2-SNAPSHOT 3.0.1 @@ -57,11 +70,18 @@ 0.5.2-SNAPSHOT 1.4.2-SNAPSHOT 1.0.2-SNAPSHOT - 7.0.32.v201211081135 - 7.0.32.v201211201952 2.3.2 + 0.1.2-SNAPSHOT 0.5.2-SNAPSHOT + 1.4 0.2.5-SNAPSHOT + etc/opendaylight/karaf + 00-netty.xml + 01-mdsal.xml + 01-netconf.xml + 03-toaster-sample.xml + 10-rest-connector.xml + 99-netconf-connector.xml 0.4.3-SNAPSHOT 0.4.3-SNAPSHOT 0.1.2-SNAPSHOT @@ -70,37 +90,32 @@ 0.5.2-SNAPSHOT 0.5.2-SNAPSHOT 0.0.2-SNAPSHOT - 7.0.42 - 0.2.0 0.4.2-SNAPSHOT 1.1.0-SNAPSHOT 2.5.0 + 3.8.0.I20120518-2145 1.3.1 1.28 3.0.0 + 0000.0002.0038.0 - 2.15 - 1.0.1 - 3.0.1 - 3.1.0 - 3.1.6 - 4.2.0 + 1.6.0 1.4.2-SNAPSHOT + 2.4.0 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.5.2-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.6.0-SNAPSHOT - 2.2.0.RELEASE - 2.2.4 - 14.0.1 + 1.1-SNAPSHOT 0.5.2-SNAPSHOT 0.5.2-SNAPSHOT 0.4.2-SNAPSHOT + 1.0.0-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.0.2-SNAPSHOT @@ -108,39 +123,25 @@ 2013.10.19.1-SNAPSHOT 2013.10.21.2-SNAPSHOT 2010.09.24.4-SNAPSHOT - 2.3.2 - 0.6.2.201302030002 - 2.4 - 1.7 - 1.7 - 3.17.1-GA - 1.2 - - 1.17 - 1.17 - 4.0 - 2.8 - 1.3.3 + 2.0-beta-2 src/main/yang-gen-config 0.0.2-SNAPSHOT 1.1.4 2.0.1 1.1.1 2.0 - 4.8.1 1.0.0-SNAPSHOT 3.0.0 3.0.1 + 0.7 + 1.8 + 1.0.0 1.0.9 0.4.2-SNAPSHOT - 2.5.1 - - 1.7 - 1.7 + 3.0.5 + 1.9.4 1.1-SNAPSHOT - 1.9.5 0.2.5-SNAPSHOT - 4.0.19.Final 0.0.3-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT @@ -151,18 +152,15 @@ 1.4.2-SNAPSHOT 1.4.2-SNAPSHOT 2013.08.27.4-SNAPSHOT - 20080701 0.0.2-SNAPSHOT - 5.0.0 - 5.0.0 - UTF-8 - UTF-8 - 2.6 + 4.0.0 + 1.1.6 + 1.1.6 1.0-alpha-2 + 2.5.0 0.5.0-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT - 2.3.2 0.4.2-SNAPSHOT 0.1.2-SNAPSHOT 0.4.2-SNAPSHOT @@ -173,17 +171,21 @@ 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT - 2.11 + 2.10 + 4 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 1.2.4 dav:http://nexus.opendaylight.org/content/sites/site - 3.2 - 1.7.2 ${user.name}-private-view https://sonar.opendaylight.org/ + 2.4 jacoco java - org.openflow.openflowj,net.sf.jung2 + target/code-coverage/jacoco.exec + target/code-coverage/jacoco-it.exec + org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages 1.0.0 1.2.1 3.1.4.RELEASE @@ -201,23 +203,25 @@ 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT + 1.0.0-SNAPSHOT 0.4.2-SNAPSHOT - 1.5.0 + 1.2.0 + 1.2.2 0.4.2-SNAPSHOT 0.0.2-SNAPSHOT 0.4.2-SNAPSHOT - 3.6.0.RELEASE + 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT src/main/xtend-gen - 2.4.3 2013.09.07.4-SNAPSHOT 1.0.0-SNAPSHOT 0.6.2-SNAPSHOT + 0.12.0 - + ${project.groupId} ietf-netconf-monitoring @@ -233,6 +237,11 @@ netconf-netty-util ${netconf.version} + + org.apache.sshd + sshd-core + ${sshd-core.version} + ch.qos.logback logback-classic @@ -299,6 +308,12 @@ guava ${guava.version} + + + com.jcabi + jcabi-maven-slf4j + 0.8 + com.sun.jersey @@ -311,12 +326,16 @@ jersey-core ${jersey.version} - com.sun.jersey jersey-server ${jersey.version} + + com.sun.jersey + jersey-servlet + ${jersey-servlet.version} + com.typesafe.akka @@ -346,6 +365,16 @@ akka-testkit_${scala.version} ${akka.version} + + com.typesafe.akka + akka-osgi_${scala.version} + ${akka.version} + + + com.typesafe.akka + akka-slf4j_${scala.version} + ${akka.version} + commons-codec commons-codec @@ -361,6 +390,11 @@ commons-io ${commons.io.version} + + commons-lang + commons-lang + ${commons.lang.version} + commons-net commons-net @@ -523,6 +557,11 @@ jsr311-api ${jsr311.api.version} + + net.sourceforge.pmd + pmd + 5.1.0 + orbit javax.activation @@ -656,11 +695,26 @@ enunciate-core-annotations ${enunciate.version} + + org.codehaus.gmaven.runtime + gmaven-runtime-2.0 + 1.5 + org.codehaus.jettison jettison ${jettison.version} + + org.eclipse + jdt + 3.3.0-v20070607-1300 + + + org.eclipse.equinox + app + 1.0.0-v20070606 + @@ -668,6 +722,11 @@ servlet 1.0.0-v20070606 + + org.eclipse.jdt + core + 3.3.0-v_771 + org.eclipse.persistence org.eclipse.persistence.antlr @@ -690,11 +749,21 @@ org.eclipse.xtend.lib ${xtend.version} + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-grizzly2 + 2.4 + org.javassist javassist ${javassist.version} + + org.jboss.resteasy + jaxrs-api + 3.0.4.Final + org.jboss.spec.javax.transaction jboss-transaction-api_1.1_spec @@ -813,6 +882,11 @@ config-persister-file-xml-adapter ${config.version} + + org.opendaylight.controller + config-persister-feature-adapter + ${config.version} + org.opendaylight.controller config-persister-impl @@ -941,6 +1015,11 @@ hosttracker.northbound ${hosttracker.northbound.version} + + org.opendaylight.controller + hosttracker.shell + ${hosttracker.shell.version} + org.opendaylight.controller hosttracker_new @@ -962,6 +1041,11 @@ karaf.branding ${karaf.branding.version} + + org.opendaylight.controller + liblldp + ${sal.version} + org.opendaylight.controller logback-config @@ -973,6 +1057,11 @@ logging.bridge ${logging.bridge.version} + + org.opendaylight.controller + dummy-console + ${dummy-console.version} + @@ -985,12 +1074,12 @@ netconf-client ${netconf.version} - - org.opendaylight.controller - netconf-client - ${netconf.version} - test-jar - + + org.opendaylight.controller + netconf-client + ${netconf.version} + test-jar + @@ -1172,6 +1261,11 @@ sal-common-util ${mdsal.version} + + org.opendaylight.controller + sal-inmemory-datastore + ${mdsal.version} + org.opendaylight.controller sal-compatibility @@ -1204,14 +1298,34 @@ org.opendaylight.controller - sal-remoterpc-connector + sal-rest-connector ${mdsal.version} org.opendaylight.controller - sal-rest-connector + sal-rest-connector-config ${mdsal.version} + + org.opendaylight.controller + config-netty-config + ${config.version} + + + org.opendaylight.controller + md-sal-config + ${mdsal.version} + + + org.opendaylight.controller + netconf-config + ${netconf.version} + + + org.opendaylight.controller + netconf-connector-config + ${netconf.version} + org.opendaylight.controller sal-rest-docgen @@ -1222,6 +1336,33 @@ sal-restconf-broker ${mdsal.version} + + org.opendaylight.controller + sal-test-model + ${mdsal.version} + + + org.opendaylight.controller + sal-distributed-datastore + ${mdsal.version} + + + org.opendaylight.controller + sal-clustering-commons + ${mdsal.version} + + + org.opendaylight.controller + sal-clustering-config + ${mdsal.version} + + + + org.opendaylight.controller + sal-remoterpc-connector + ${mdsal.version} + + @@ -1276,6 +1417,11 @@ security ${security.version} + + org.opendaylight.controller + karaf-tomcat-security + ${karaf.security.version} + org.opendaylight.controller @@ -1349,6 +1495,11 @@ topologymanager ${topologymanager.version} + + org.opendaylight.controller + topologymanager.shell + ${topologymanager.shell.version} + org.opendaylight.controller troubleshoot.web @@ -1424,24 +1575,83 @@ org.opendaylight.controller.model - model-flow-management + model-flow-service ${mdsal.version} org.opendaylight.controller.model - model-flow-service + model-flow-statistics ${mdsal.version} org.opendaylight.controller.model - model-flow-statistics + model-inventory ${mdsal.version} org.opendaylight.controller.model - model-inventory + model-topology + ${mdsal.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 + toaster-config + ${mdsal.version} + + + org.opendaylight.yangtools + features-test + ${yangtools.version} + test + + + org.opendaylight.yangtools + features-yangtools + ${yangtools.version} + features + xml + runtime + + + org.opendaylight.controller.samples + features-toaster + ${mdsal.version} + features + xml + runtime + + + org.opendaylight.controller + features-config-netty + ${config.version} + features + xml + runtime + + + org.opendaylight.controller + features-flow + ${mdsal.version} + features + xml + runtime + org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet @@ -1450,7 +1660,7 @@ org.opendaylight.controller.thirdparty ganymed - 1.1-SNAPSHOT + ${ganymed.version} @@ -1473,6 +1683,11 @@ binding-generator-impl ${yangtools.version} + + org.opendaylight.yangtools + binding-data-codec + ${yangtools.version} + org.opendaylight.yangtools binding-generator-spi @@ -1518,6 +1733,11 @@ util ${yangtools.version} + + org.opendaylight.yangtools + yang-data-composite-node + ${yangtools.version} + @@ -1611,6 +1831,16 @@ yang-ext ${yang-ext.version} + + org.opendaylight.yangtools.thirdparty + antlr4-runtime-osgi-nohead + 4.0 + + + org.opendaylight.yangtools.thirdparty + xtend-lib-osgi + ${xtend.version} + org.openexi nagasena @@ -1631,17 +1861,10 @@ org.osgi.core ${osgi.core.version} - - - org.ow2.asm - asm-all - 4.1 - - - org.ow2.chameleon.management - chameleon-mbeans - 1.0.0 + org.reflections + reflections + 0.9.9-RC1 org.scala-lang @@ -1665,93 +1888,9 @@ compile - org.springframework - org.springframework.aop - ${spring.version} - - - org.springframework - org.springframework.asm - ${spring.version} - - - org.springframework - org.springframework.beans - ${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.expression - ${spring.version} - - - org.springframework - org.springframework.transaction - ${spring-security.version} - - - org.springframework - org.springframework.web - ${spring.version} - - - 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-taglibs - ${spring-security.version} - - - org.springframework.security - spring-security-web - ${spring-security.version} - - - virgomirror - org.eclipse.jdt.core.compiler.batch - 3.8.0.I20120518-2145 - - - junit - junit - ${junit.version} - test - - - org.mockito - mockito-all - ${mockito.version} - test + org.slf4j + slf4j-simple + ${slf4j.version} org.opendaylight.controller @@ -1778,47 +1917,91 @@ ${yangtools.version} test - - org.ops4j.pax.exam - pax-exam-container-native - ${exam.version} - test + org.opendaylight.controller + features-config + ${config.version} + features + xml + runtime - org.ops4j.pax.exam - pax-exam-junit4 - ${exam.version} - test + org.opendaylight.controller + features-protocol-framework + ${protocol-framework.version} + features + xml + runtime - org.ops4j.pax.exam - pax-exam-link-mvn - ${exam.version} - test + org.opendaylight.controller + features-netconf + ${netconf.version} + features + xml + runtime - org.ops4j.pax.url - pax-url-aether - ${url.version} - test + org.opendaylight.controller + features-config-persister + ${config.version} + features + xml + runtime - - org.springframework.osgi - spring-osgi-mock - ${spring-osgi.version} - test + org.opendaylight.controller + config-netty-features + ${config.version} + features + xml + runtime - xmlunit - xmlunit - 1.5 - test + org.opendaylight.controller + features-base + ${commons.opendaylight.version} + features + xml + runtime + + + org.opendaylight.controller + features-adsal + ${sal.version} + features + xml + runtime + + + org.opendaylight.controller + features-nsf + ${nsf.version} + features + xml + runtime + + + org.opendaylight.controller + features-mdsal + ${mdsal.version} + features + xml + runtime + + + + org.codehaus.sonar-plugins.java + sonar-jacoco-listeners + ${sonar-jacoco-listeners.version} + test + + + @@ -1962,7 +2145,7 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 + ${lifecycle.mapping.version} @@ -2074,6 +2257,21 @@ + + + org.codehaus.mojo + javacc-maven-plugin + [0.0,) + + javacc + + + + + false + + + @@ -2097,6 +2295,30 @@ org.jacoco jacoco-maven-plugin ${jacoco.version} + + + prepare-ut-agent + process-test-classes + + prepare-agent + + + ${sonar.jacoco.reportPath} + jacoco.agent.ut.arg + + + + prepare-it-agent + pre-integration-test + + prepare-agent + + + ${sonar.jacoco.itReportPath} + jacoco.agent.it.arg + + + org.opendaylight.yangtools @@ -2130,7 +2352,7 @@ true ${project.basedir} **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat - **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/xtend-gen\/ + **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/xtend-gen\/,**\/protobuff\/ @@ -2173,13 +2395,20 @@ maven-failsafe-plugin ${failsafe.version} - ${testvm.argLine} + ${testvm.argLine} ${jacoco.agent.it.arg} logback.configurationFile logback.xml + + + + listener + org.sonar.java.jacoco.JUnitListener + + @@ -2203,19 +2432,30 @@ maven-surefire-plugin ${surefire.version} - ${testvm.argLine} + ${testvm.argLine} ${jacoco.agent.ut.arg} logback.configurationFile logback.xml + + + + listener + org.sonar.java.jacoco.JUnitListener + + org.codehaus.mojo build-helper-maven-plugin + + org.jacoco + jacoco-maven-plugin + @@ -2306,7 +2546,7 @@ opendaylight-mirror opendaylight-mirror - ${nexusproxy}/groups/public/ + http://nexus.opendaylight.org/content/groups/public/ @@ -2318,7 +2558,7 @@ opendaylight-snapshot opendaylight-snapshot - ${nexusproxy}/repositories/${nexus.repository.snapshot}/ + http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ @@ -2334,7 +2574,7 @@ opendaylight-mirror opendaylight-mirror - ${nexusproxy}/groups/public/ + http://nexus.opendaylight.org/content/groups/public/ @@ -2346,19 +2586,19 @@ opendaylight-snapshot opendaylight-snapshot - ${nexusproxy}/repositories/${nexus.repository.snapshot}/ + http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ opendaylight-release - ${nexusproxy}/repositories/${nexus.repository.release}/ + http://nexus.opendaylight.org/content/repositories/opendaylight.release/ opendaylight-snapshot - ${nexusproxy}/repositories/${nexus.repository.snapshot}/ + http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/