X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fpom.xml;h=dca781e7ec403d2f9b4968eed59e4003b8d6b2ac;hp=35e160e8274e9fe5ee09bc49ce90f77841218425;hb=591fd680eea5c6183436cc72e756326af1505ac0;hpb=ad65bbdb5841a166f37b6cbaa6d5c457c5c77f27 diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index 35e160e827..dca781e7ec 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.controller commons.opendaylight - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT ../../commons/opendaylight @@ -26,9 +26,7 @@ - - org.opendaylight.controller sal-common @@ -134,6 +132,30 @@ forwardingrules-manager ${mdsal.version} + + org.opendaylight.controller.md + topology-lldp-discovery + ${mdsal.version} + + + org.opendaylight.controller.md + topology-manager + ${mdsal.version} + + + org.opendaylight.controller.model + model-topology + 1.1-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-topology + + + org.opendaylight.controller + sal-binding-util + 1.1-SNAPSHOT + org.opendaylight.controller.md statistics-manager @@ -145,18 +167,15 @@ ${concepts.version} - org.opendaylight.yangtools - concepts - 0.1.1-SNAPSHOT + org.opendaylight.controller + protocol-framework - - org.opendaylight.controller - clustered-datastore-implementation - 0.4.1-SNAPSHOT + org.opendaylight.yangtools + concepts + ${yangtools.version} - org.opendaylight.controller @@ -175,67 +194,58 @@ org.opendaylight.controller - netty-event-executor-config - ${config.version} - - - org.opendaylight.controller - netty-threadgroup-config - ${config.version} - - - org.opendaylight.controller - threadpool-config-api + yang-store-api ${config.version} org.opendaylight.controller - threadpool-config-impl + yang-store-impl ${config.version} org.opendaylight.controller - yang-store-api + logback-config ${config.version} org.opendaylight.controller - yang-store-api + config-persister-api ${config.version} org.opendaylight.controller - yang-store-impl + config-persister-file-adapter ${config.version} org.opendaylight.controller - logback-config + config-persister-file-xml-adapter ${config.version} org.opendaylight.controller - config-persister-api + config-persister-directory-adapter ${config.version} org.opendaylight.controller - config-persister-file-adapter + config-persister-directory-xml-adapter ${config.version} org.opendaylight.controller - config-persister-file-xml-adapter + config-persister-directory-autodetect-adapter ${config.version} + org.opendaylight.controller - config-persister-directory-adapter + shutdown-api ${config.version} org.opendaylight.controller - config-persister-directory-xml-adapter + shutdown-impl ${config.version} @@ -295,11 +305,6 @@ config-persister-impl ${netconf.version} - - org.opendaylight.controller.thirdparty - exificient - ${exi.version} - org.apache.servicemix.bundles org.apache.servicemix.bundles.xerces @@ -364,37 +369,37 @@ org.opendaylight.yangtools yang-binding - 0.6.0-SNAPSHOT + 0.6.1 org.opendaylight.yangtools binding-type-provider - 0.6.0-SNAPSHOT + 0.6.1 org.opendaylight.yangtools binding-generator-spi - ${yangtools.binding.version} + ${yangtools.version} org.opendaylight.yangtools binding-generator-api - ${yangtools.binding.version} + ${yangtools.version} org.opendaylight.yangtools binding-generator-impl - ${yangtools.binding.version} + ${yangtools.version} org.opendaylight.yangtools binding-generator-util - ${yangtools.binding.version} + ${yangtools.version} org.opendaylight.yangtools binding-model-api - ${yangtools.binding.version} + ${yangtools.version} commons-lang @@ -438,7 +443,6 @@ org.opendaylight.yangtools yang-data-impl - 0.5.9-SNAPSHOT org.opendaylight.yangtools @@ -457,22 +461,23 @@ ganymed - org.opendaylight.controller - sal-remoterpc-connector - 1.0-SNAPSHOT + org.zeromq + jeromq + 0.3.1 + - org.opendaylight.controller - - zeromq-routingtable.implementation - - 0.4.1-SNAPSHOT + org.opendaylight.yangtools.model + ietf-inet-types - org.zeromq - jeromq - 0.3.1 - + org.opendaylight.yangtools.model + ietf-yang-types + + + org.opendaylight.yangtools.model + opendaylight-l2-types + @@ -486,6 +491,13 @@ org.apache.maven.plugins maven-dependency-plugin 2.8 + + + org.opendaylight.controller + sanitytest + ${controller.version} + + copy @@ -500,7 +512,6 @@ org.opendaylight.controller sanitytest - ${controller.version} jar @@ -535,146 +546,125 @@ + + + org.opendaylight.controller + sanitytest + + distribution.opendaylight - 0.1.1-SNAPSHOT + 0.1.2-SNAPSHOT pom org.opendaylight.controller forwarding.staticrouting - ${forwarding.staticrouting} org.opendaylight.controller clustering.services - ${clustering.services.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 - ${arphandler.version} org.opendaylight.controller hosttracker - ${hosttracker.version} org.opendaylight.controller hosttracker.implementation - ${hosttracker.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 - ${statisticsmanager.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 - ${forwardingrulesmanager.version} org.opendaylight.controller forwardingrulesmanager.implementation - ${controller.version} - org.opendaylight.controller sal - ${sal.version} org.opendaylight.controller sal.implementation - ${controller.version} @@ -682,22 +672,18 @@ 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} @@ -705,191 +691,150 @@ 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} org.opendaylight.controller osgi-brandfragment.web - 0.0.1-SNAPSHOT - org.opendaylight.controller networkconfig.neutron - ${controller.version} org.opendaylight.controller networkconfig.neutron.implementation - ${controller.version} org.opendaylight.controller networkconfig.neutron.northbound - ${controller.version} - 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} org.opendaylight.controller httpservice-bridge - 0.0.1-SNAPSHOT org.jolokia jolokia-osgi - ${jolokia.version} org.opendaylight.controller jolokia-bridge - ${jolokia.bridge.version} org.opendaylight.controller connectionmanager.northbound - ${connectionmanager.version} org.opendaylight.controller usermanager.northbound - 0.0.1-SNAPSHOT org.opendaylight.controller controllermanager.northbound - 0.0.1-SNAPSHOT org.opendaylight.controller logging.bridge - ${controller.version} org.opendaylight.controller protocol_plugins.openflow - ${controller.version} org.opendaylight.controller samples.loadbalancer - ${samples.loadbalancer} 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 @@ -903,22 +848,37 @@ ch.qos.logback logback-classic + + + com.fasterxml.jackson.core + jackson-databind + + - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-annotations + - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core + - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + org.codehaus.jettison jettison @@ -1047,8 +1007,6 @@ com.google.code.gson gson - 2.2.4 - compile org.jboss.spec.javax.transaction @@ -1143,26 +1101,6 @@ 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 @@ -1233,22 +1171,16 @@ 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 @@ -1269,17 +1201,12 @@ org.eclipse.equinox.http servlet - org.apache.felix org.apache.felix.webconsole - 4.2.0 all - @@ -1299,33 +1226,6 @@ 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.bgpcep - concepts - - - org.opendaylight.bgpcep - util - - - org.opendaylight.bgpcep - framework - @@ -1349,29 +1249,17 @@ netty-common - - + - org.opendaylight.controller - clustering.test - ${controller.version} - - - org.opendaylight.controller - commons.httpclient - ${commons.httpclient.version} + org.opendaylight.controller + clustering.test - org.opendaylight.controller - sanitytest - ${controller.version} + commons.httpclient - - - @@ -1411,6 +1299,16 @@ + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle.version} + + **\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/ + +