X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fpom.xml;h=79b9ccea832a26a5b295ef469d768f77717a0583;hb=4b5f54e25c08fc21c955ff75901abe96b12d3340;hp=033d0573f9e43b641192856ae62675c5c91a7682;hpb=cf000a86e871a4acf98cf15ba31ce140e6c0f262;p=controller.git diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index 033d0573f9..79b9ccea83 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,264 +26,248 @@ - - org.opendaylight.controller sal-common - ${mdsal.version} org.opendaylight.controller sal-common-util - ${mdsal.version} org.opendaylight.controller sal-netconf-connector - ${mdsal.version} org.opendaylight.controller sal-core-api - ${mdsal.version} org.opendaylight.controller sal-broker-impl - ${mdsal.version} + + + org.opendaylight.controller + sal-remote + + + org.opendaylight.controller + sal-restconf-broker org.opendaylight.controller sal-core-spi - ${mdsal.version} org.opendaylight.controller sal-common-api - ${mdsal.version} org.opendaylight.controller sal-common-impl - ${mdsal.version} org.opendaylight.controller sal-binding-api - ${mdsal.version} org.opendaylight.controller sal-binding-config - ${mdsal.version} org.opendaylight.controller sal-binding-broker-impl - ${mdsal.version} org.opendaylight.controller sal-compatibility - ${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.model model-flow-management - ${mdsal.version} org.opendaylight.controller.md inventory-manager - ${mdsal.version} org.opendaylight.controller.md forwardingrules-manager - ${mdsal.version} + + + org.opendaylight.controller.md + topology-lldp-discovery + + + org.opendaylight.controller.md + topology-manager + + + org.opendaylight.controller.model + model-topology + 1.1-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-topology + + + org.opendaylight.controller + sal-binding-util org.opendaylight.controller.md statistics-manager - ${mdsal.version} org.opendaylight.controller concepts - ${concepts.version} + + + org.opendaylight.controller + protocol-framework org.opendaylight.yangtools concepts - 0.1.1-SNAPSHOT - - org.opendaylight.controller - clustered-datastore-implementation - 0.4.1-SNAPSHOT + org.opendaylight.yangtools + restconf-client-api + + + org.opendaylight.yangtools + restconf-client-impl - org.opendaylight.controller config-api - ${config.version} org.opendaylight.controller config-manager - ${config.version} org.opendaylight.controller yang-jmx-generator - ${config.version} org.opendaylight.controller - netty-event-executor-config - ${config.version} + yang-store-api org.opendaylight.controller - netty-threadgroup-config - ${config.version} + yang-store-impl org.opendaylight.controller - threadpool-config-api - ${config.version} + logback-config org.opendaylight.controller - threadpool-config-impl - ${config.version} + config-persister-api org.opendaylight.controller - yang-store-api - ${config.version} + config-persister-file-adapter org.opendaylight.controller - yang-store-api - ${config.version} + config-persister-file-xml-adapter org.opendaylight.controller - yang-store-impl - ${config.version} + config-persister-directory-adapter org.opendaylight.controller - logback-config - ${config.version} + config-persister-directory-xml-adapter org.opendaylight.controller - config-persister-api - ${config.version} + config-persister-directory-autodetect-adapter + org.opendaylight.controller - config-persister-file-adapter - ${config.version} + shutdown-api + + + org.opendaylight.controller + shutdown-impl - - org.opendaylight.controller - config-persister-directory-adapter - ${config.version} - org.opendaylight.controller netconf-api - ${netconf.version} org.opendaylight.controller netconf-impl - ${netconf.version} org.opendaylight.controller netconf-util - ${netconf.version} org.opendaylight.controller netconf-client - ${netconf.version} org.opendaylight.controller netconf-mapping-api - ${netconf.version} org.opendaylight.controller netconf-ssh - ${netconf.version} org.opendaylight.controller config-netconf-connector - ${netconf.version} org.opendaylight.controller netconf-monitoring - ${netconf.version} ${project.groupId} ietf-netconf-monitoring - ${netconf.version} - org.opendaylight.controller - config-persister-impl - ${netconf.version} + ${project.groupId} + ietf-netconf-monitoring-extension - org.opendaylight.controller.thirdparty - exificient - ${exi.version} + org.opendaylight.controller + config-persister-impl org.apache.servicemix.bundles @@ -300,35 +284,28 @@ org.opendaylight.controller threadpool-config-api - ${config.version} org.opendaylight.controller netty-config-api - ${config.version} org.opendaylight.controller threadpool-config-impl - ${config.version} org.opendaylight.controller netty-threadgroup-config - ${config.version} org.opendaylight.controller netty-event-executor-config - ${config.version} org.opendaylight.controller netty-timer-config - ${config.version} - org.opendaylight.controller.samples @@ -349,37 +326,36 @@ org.opendaylight.yangtools yang-binding - 0.6.0-SNAPSHOT org.opendaylight.yangtools binding-type-provider - 0.6.0-SNAPSHOT + ${yangtools.version} 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 @@ -405,7 +381,6 @@ org.opendaylight.yangtools yang-model-util - ${yangtools.version} org.opendaylight.yangtools @@ -423,7 +398,6 @@ org.opendaylight.yangtools yang-data-impl - 0.5.9-SNAPSHOT org.opendaylight.yangtools @@ -442,26 +416,26 @@ 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 + - integrationtests false @@ -470,181 +444,182 @@ org.apache.maven.plugins - maven-invoker-plugin - 1.5 + maven-dependency-plugin + 2.8 + + + org.opendaylight.controller + sanitytest + ${controller.version} + + + + + copy + package + + copy + + + - false - ../sanitytest - - pom.xml - - true - true - - clean - verify - - - - - integration-test - - install - run - - - - + + + org.opendaylight.controller + sanitytest + jar + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + sanity-test + package + + exec + + + + + ${java.home}/bin/java + + -cp + ./target/dependency/* + org.opendaylight.controller.distribution.Sanity + + + + ${java.home} + + + + - - org.opendaylight.controller - controller-maven-plugin - 0.1.0-SNAPSHOT + 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} @@ -652,22 +627,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} @@ -675,191 +646,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 @@ -873,22 +803,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 @@ -1017,8 +962,6 @@ com.google.code.gson gson - 2.2.4 - compile org.jboss.spec.javax.transaction @@ -1113,26 +1056,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 @@ -1203,22 +1126,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 @@ -1239,17 +1156,12 @@ org.eclipse.equinox.http servlet - org.apache.felix org.apache.felix.webconsole - 4.2.0 all - @@ -1269,33 +1181,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 - @@ -1318,23 +1203,22 @@ io.netty netty-common + + io.netty + netty-codec-http + - - + - org.opendaylight.controller - clustering.test - ${controller.version} + org.opendaylight.controller + clustering.test - org.opendaylight.controller - commons.httpclient - ${commons.httpclient.version} + org.opendaylight.controller + commons.httpclient - - @@ -1375,7 +1259,15 @@ + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle.version} + + **\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/ + + -