X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=a794385218a13432cd846736b1b5e396ad24b7d4;hp=7a977f954555160062b6be7814d1331a8c4690c6;hb=99f1cd928117d23e13ab385b8d9b5b098554158a;hpb=cad0f415169cae900315546bf2dae7801d2ee5e2 diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 7a977f9545..a794385218 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -4,155 +4,126 @@ org.opendaylight.odlparent odlparent - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT org.opendaylight.controller commons.opendaylight - 1.5.0-SNAPSHOT + 1.7.0-SNAPSHOT pom - - 2.3.9 - 0.5.0-SNAPSHOT - 0.1.0-SNAPSHOT - 0.6.0-SNAPSHOT + 2.1.0-SNAPSHOT + 0.9.0-SNAPSHOT + 2.3.14 + 0.7.0-SNAPSHOT + 0.3.0-SNAPSHOT + 0.8.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT 3.0.1 - 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.1.0-SNAPSHOT - 0.2.0-SNAPSHOT - 0.1.0-SNAPSHOT - 3.0.1 - 0.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - 0.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - 1.4 - 0.3.0-SNAPSHOT - 0.2.0-SNAPSHOT + 0.3.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.3.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.8.0-SNAPSHOT + 1.7.0-SNAPSHOT + 1.3.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.4.0-SNAPSHOT etc/opendaylight/karaf 05-clustering.xml + 06-clustered-entity-ownership.xml 00-netty.xml 01-md-sal.xml 04-xsql.xml - 01-netconf.xml 03-toaster-sample.xml - 08-mdsal-netconf.xml 10-rest-connector.xml - 99-netconf-connector.xml - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.2.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.1.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.2.0-SNAPSHOT + + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.3.0-SNAPSHOT + 0.7.0-SNAPSHOT + 1.4.0-SNAPSHOT 30-statistics-manager.xml - 2.5.0 - 3.8.0.I20120518-2145 - 0000.0002.0038.0 - 1.6.0 - 1.5.0-SNAPSHOT - 1.5.0-SNAPSHOT + 0000.0002.0053.0 + 1.7.0-SNAPSHOT + 1.7.0-SNAPSHOT 2.4.0 - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.7.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.1.0-SNAPSHOT - 2010.09.24.7-SNAPSHOT - 2013.10.19.7-SNAPSHOT - 2013.10.21.7-SNAPSHOT - 2010.09.24.7-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.9.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT + 1.3.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.3.0-SNAPSHOT + 2010.09.24.9-SNAPSHOT + 2013.10.19.9-SNAPSHOT + 2013.10.21.9-SNAPSHOT + 2010.09.24.9-SNAPSHOT 2.0-beta-2 src/main/yang-gen-config - 0.1.0-SNAPSHOT - 1.1.4 - 1.1.1 - 2.0 - 1.1.0-SNAPSHOT - 3.0.0 - 3.0.1 + 0.3.0-SNAPSHOT + 1.3.0-SNAPSHOT + ${karaf.version} 0.7 - 1.8 + 1.8-odl 1.0.0 - 0.5.0-SNAPSHOT + 0.7.0-SNAPSHOT 3.0.5 - 1.9.4 - 1.2.0-SNAPSHOT - 0.3.0-SNAPSHOT - 0.1.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT + 1.4.0-SNAPSHOT + 0.3.0-SNAPSHOT http://nexus.opendaylight.org/content - 0.5.0-SNAPSHOT - 1.5.0-SNAPSHOT - 1.5.0-SNAPSHOT - 2013.08.27.7-SNAPSHOT - 0.1.0-SNAPSHOT - 1.1.6 - 1.1.6 - 1.0-alpha-2 + 0.7.0-SNAPSHOT + 1.7.0-SNAPSHOT + 1.7.0-SNAPSHOT + 2013.08.27.9-SNAPSHOT + 0.3.0-SNAPSHOT 2.5.0 - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.2.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.1.0-SNAPSHOT - 0.9.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.4.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.3.0-SNAPSHOT + 0.11.0-SNAPSHOT src/main/yang-gen-sal - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 2.10 - 4 - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.2.4 + 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 2.11 + 7 + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT dav:http://nexus.opendaylight.org/content/sites/site - ${user.name}-private-view https://sonar.opendaylight.org/ 2.4 @@ -161,62 +132,77 @@ 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 - 3.1.3.RELEASE - 3.1.3.RELEASE - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.6.0-SNAPSHOT - 0.5.0-SNAPSHOT - 2.15 - 0.8.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.8.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.10.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT -Xmx1024m -XX:MaxPermSize=256m - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.1.0-SNAPSHOT - 0.5.0-SNAPSHOT - 1.2.0 + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 1.3.0-SNAPSHOT + 0.7.0-SNAPSHOT 1.2.2a - 0.5.0-SNAPSHOT - 0.1.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT - 2013.09.07.7-SNAPSHOT - 1.1.0-SNAPSHOT - 0.7.0-SNAPSHOT - 0.12.0 + 0.7.0-SNAPSHOT + 0.3.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 0.7.0-SNAPSHOT + 2013.09.07.9-SNAPSHOT + 1.3.0-SNAPSHOT + 1.0.0-SNAPSHOT 0.9.7 - 3.3.0 - + + + - org.opendaylight.controller - config-artifacts - ${config.version} + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} pom import + + + - org.opendaylight.controller + org.opendaylight.mdsal mdsal-artifacts - ${mdsal.version} + 2.1.0-SNAPSHOT + pom + import + + + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsal.model.version} + pom + import + + + + org.opendaylight.controller + config-artifacts + ${config.version} pom import + + org.opendaylight.controller - netconf-artifacts - ${netconf.version} + mdsal-artifacts + ${mdsal.version} pom import @@ -224,17 +210,7 @@ org.apache.sshd sshd-core - ${sshd-core.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - ${logback.version} + 0.14.0 com.codahale.metrics @@ -246,62 +222,6 @@ metrics-graphite ${codahale.metrics.version} - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-json-org - ${jackson.version} - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.version} - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - ${jackson.version} - - - com.github.romix - java-concurrent-hash-trie-map - ${ctrie.version} - - - com.google.code.gson - gson - ${gson.version} - - - com.google.guava - guava - ${guava.version} - - - com.lmax - disruptor - ${lmax.version} - @@ -311,28 +231,6 @@ provided - - com.sun.jersey - jersey-client - ${jersey.version} - - - - com.sun.jersey - jersey-core - ${jersey.version} - - - com.sun.jersey - jersey-server - ${jersey.version} - - - com.sun.jersey - jersey-servlet - ${jersey-servlet.version} - - com.typesafe.akka akka-actor_${scala.version} @@ -371,336 +269,16 @@ akka-slf4j_${scala.version} ${akka.version} - - commons-codec - commons-codec - ${commons.codec.version} - - - commons-fileupload - commons-fileupload - ${commons.fileupload.version} - - - commons-io - commons-io - ${commons.io.version} - - - commons-lang - commons-lang - ${commons.lang.version} - - - commons-net - commons-net - ${commons.net.version} - - - eclipselink - javax.persistence - 2.0.4.v201112161009 - - - eclipselink - javax.resource - 1.5.0.v200906010428 - - - equinoxSDK381 - javax.servlet - 3.0.0.v201112011016 - - - equinoxSDK381 - javax.servlet.jsp - 2.2.0.v201112011158 - - - 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.ds - 1.4.0.v20120522-1841 - - - equinoxSDK381 - org.eclipse.equinox.launcher - 1.3.0.v20120522-1813 - - - equinoxSDK381 - org.eclipse.equinox.util - 1.0.400.v20120522-2049 - - - equinoxSDK381 - org.eclipse.osgi - 3.8.1.v20120830-144521 - - - equinoxSDK381 - org.eclipse.osgi.services - 3.3.100.v20120522-1822 - - - - 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} - - - io.netty - netty-buffer - ${netty.version} - - - io.netty - netty-codec - ${netty.version} - - - io.netty - netty-codec-http - ${netty.version} - - - io.netty - netty-common - ${netty.version} - - - - io.netty - netty-handler - ${netty.version} - - - io.netty - netty-transport - ${netty.version} - - - javax.ws.rs - jsr311-api - ${jsr311.api.version} - net.sourceforge.pmd pmd 5.1.0 - - 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.servlet.jsp.jstl - 1.2.0.v201105211821 - - - orbit - javax.servlet.jsp.jstl.impl - 1.2.0.v201210211230 - - - orbit - javax.xml.rpc - 1.1.0.v201005080400 - - - orbit - org.apache.catalina - ${commons.catalina} - - - orbit - org.apache.catalina.ha - ${commons.catalina.ha} - - - orbit - org.apache.catalina.tribes - ${commons.catalina.tribes} - - - orbit - org.apache.coyote - ${commons.coyote} - - - orbit - org.apache.el - ${commons.el} - - - orbit - org.apache.jasper - ${commons.jasper} - - - orbit - org.apache.juli.extras - ${commons.juli.version} - - - orbit - org.apache.tomcat.api - ${commons.tomcat.api} - - - orbit - org.apache.tomcat.util - ${commons.tomcat.util} - - - org.aopalliance - com.springsource.org.aopalliance - ${aopalliance.version} - - - org.apache.commons - commons-lang3 - ${commons.lang3.version} - - - org.apache.felix - org.apache.felix.dependencymanager - ${felix.dependencymanager.version} - - - org.apache.felix - org.apache.felix.dependencymanager.shell - ${felix.dependencymanager.shell.version} - - - org.apache.felix - org.apache.felix.fileinstall - ${felix.fileinstall.version} - - - - org.apache.felix - org.apache.felix.webconsole - ${felix.webconsole.version} - - all - - - org.bouncycastle - bcpkix-jdk15on - ${bouncycastle.version} - - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - - - org.codehaus.enunciate - enunciate-core-annotations - ${enunciate.version} - org.codehaus.gmaven.runtime gmaven-runtime-2.0 1.5 - - org.codehaus.jettison - jettison - ${jettison.version} - org.eclipse jdt @@ -711,32 +289,32 @@ app 1.0.0-v20070606 - - - org.eclipse.equinox.http - servlet - 1.0.0-v20070606 + org.uncommons.maths + uncommons-maths + ${uncommons.maths.version} - org.eclipse.jdt - core - 3.3.0-v_771 + com.google.protobuf + protobuf-java + ${protobuf.version} - org.eclipse.persistence - org.eclipse.persistence.antlr - ${eclipse.persistence.version} + org.iq80.leveldb + leveldb + ${leveldb.version} - org.eclipse.persistence - org.eclipse.persistence.core - ${eclipse.persistence.version} + org.fusesource.leveldbjni + leveldbjni-all + ${leveldbjni.version} + + - org.eclipse.persistence - org.eclipse.persistence.moxy - ${eclipse.persistence.version} + org.eclipse.jdt + core + 3.3.0-v_771 @@ -745,31 +323,6 @@ 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 - 1.0.1.Final - - - org.jolokia - jolokia-osgi - ${jolokia.version} - - - org.json - json - ${org.json.version} - org.opendaylight.controller appauth @@ -955,12 +508,12 @@ org.opendaylight.controller httpservice-bridge - 0.1.0-SNAPSHOT + 0.3.0-SNAPSHOT org.opendaylight.controller jolokia-bridge - 0.1.0-SNAPSHOT + 0.3.0-SNAPSHOT @@ -991,22 +544,6 @@ ${networkconfig.bridgedomain.northbound.version} - - - org.opendaylight.controller - networkconfig.neutron - ${networkconfig.neutron.version} - - - org.opendaylight.controller - networkconfig.neutron.implementation - ${networkconfig.neutron.implementation.version} - - - org.opendaylight.controller - networkconfig.neutron.northbound - ${networkconfig.neutron.northbound.version} - org.opendaylight.controller osgi-brandfragment.web @@ -1204,11 +741,6 @@ xml runtime - - org.opendaylight.controller.thirdparty - com.sun.jersey.jersey-servlet - ${jersey-servlet.version} - @@ -1219,7 +751,7 @@ org.opendaylight.controller.thirdparty org.apache.catalina.filters.CorsFilter - ${corsfilter.version} + 7.0.42 org.opendaylight.controller.thirdparty @@ -1227,22 +759,14 @@ 1.0.2 - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - org.openexi + openexi nagasena ${exi.nagasena.version} - org.openexi + openexi nagasena-rta ${exi.nagasena.version} @@ -1254,33 +778,17 @@ org.scala-lang scala-library - ${scala.version}.1 - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} + ${scala.version}.${scala.micro.version} - org.slf4j - log4j-over-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - compile - - - org.slf4j - slf4j-simple - ${slf4j.version} + org.scala-lang + scala-reflect + ${scala.version}.${scala.micro.version} org.opendaylight.controller commons.logback_settings - 0.1.0-SNAPSHOT + 0.3.0-SNAPSHOT test @@ -1291,47 +799,6 @@ xml runtime - - 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-netconf-connector - ${mdsal.version} - features - xml - runtime - - - - org.opendaylight.controller - features-neutron - features - xml - runtime - ${networkconfig.neutron.version} - @@ -1396,15 +863,10 @@ ${java.version.target} - - org.apache.maven.plugins - maven-jar-plugin - ${jar.plugin.version} - org.apache.maven.plugins maven-javadoc-plugin - 2.8.1 + ${maven.javadoc.version} org.jboss.apiviz.APIviz @@ -1435,11 +897,6 @@ target/apidocs - - org.apache.maven.plugins - maven-release-plugin - ${releaseplugin.version} - org.codehaus.enunciate maven-enunciate-plugin @@ -1448,15 +905,10 @@ enunciate.xml - - org.codehaus.enunciate - enunciate-swagger - ${enunciate.version} - org.opendaylight.controller commons.logback_settings - 0.1.0-SNAPSHOT + 0.3.0-SNAPSHOT @@ -1659,9 +1111,9 @@ ${yangtools.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin - ${yangtools.version} + ${mdsal.model.version} jar @@ -1690,7 +1142,7 @@ org.opendaylight.controller checkstyle - 0.1.0-SNAPSHOT + 0.3.0-SNAPSHOT @@ -1805,7 +1257,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.8.1 + ${maven.javadoc.version} org.jboss.apiviz.APIviz @@ -1861,73 +1313,12 @@ - scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git HEAD https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - - - - - - - true - never - - - false - - opendaylight-mirror - opendaylight-mirror - http://nexus.opendaylight.org/content/groups/public/ - - - - - false - - - true - - opendaylight-snapshot - opendaylight-snapshot - http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - - - - - - - true - never - - - false - - opendaylight-mirror - opendaylight-mirror - http://nexus.opendaylight.org/content/groups/public/ - - - - - false - - - true - - opendaylight-snapshot - opendaylight-snapshot - http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - - - target-ide - - viewbuild