X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=406868c32bd7f6c89d8b37eef14369280e6a5750;hb=7db0eadf959b1d6918f4f9e8afd5ef05819d1580;hp=a652845770eb64009bf8fc79fc63356ce99a3e95;hpb=49bfc449558d0306f0b6550bc5bdf41e5cafca44;p=controller.git diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index a652845770..406868c32b 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -46,7 +46,7 @@ org.openflow.openflowj,net.sf.jung2 1.0.9 1.7.2 - 1.9.8 + 2.3.0 3.1.3.RELEASE 3.1.3.RELEASE 1.2.1 @@ -56,13 +56,13 @@ 1.1.4 2.10 -Xmx1024m -XX:MaxPermSize=256m - 0.5.9-SNAPSHOT 14.0.1 5.0.0 - 2010.09.24.1 - 2010.09.24.1 - 2013.08.27.1 - 2013.09.07.1 + 2010.09.24.2-SNAPSHOT + 2010.09.24.2-SNAPSHOT + 2013.10.21.0-SNAPSHOT + 2013.08.27.2-SNAPSHOT + 2013.09.07.2-SNAPSHOT 3.17.1-GA 1.0-SNAPSHOT 2.3.2 @@ -72,11 +72,12 @@ 2.3.7 4.8.1 0.3.0-SNAPSHOT - 0.5.9-SNAPSHOT - 0.6.0-SNAPSHOT + 0.6.0-SNAPSHOT 0.4.1-SNAPSHOT - 0.5.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.5.1-SNAPSHOT 0.5.1-SNAPSHOT 0.5.1-SNAPSHOT 0.5.1-SNAPSHOT @@ -84,22 +85,35 @@ 0.2.3-SNAPSHOT 1.0-SNAPSHOT 0.5.1-SNAPSHOT - 0.6.1-SNAPSHOT + 0.5.1-SNAPSHOT + 0.7.0-SNAPSHOT 0.1.1-SNAPSHOT - 0.6.0-SNAPSHOT + 0.7.0-SNAPSHOT 0.0.2-SNAPSHOT 0.1.1-SNAPSHOT 0.0.2-SNAPSHOT 0.1.1-SNAPSHOT 0.5.1-SNAPSHOT - 0.0.1-SNAPSHOT + 0.4.0-SNAPSHOT 4.0.10.Final 2.4 + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + + 1.17 + 7.0.42 + + 0.4.1-SNAPSHOT jacoco java - 0.5.0-SNAPSHOT - 0.5.0-SNAPSHOT 2.5.1 1.7 1.7 @@ -148,26 +162,43 @@ logback-classic ${logback.version} - - org.codehaus.jackson - jackson-mapper-asl - ${jackson.version} - - - org.codehaus.jackson - jackson-core-asl + + + 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.jaxrs + jackson-jaxrs-base ${jackson.version} - - - org.codehaus.jackson - jackson-jaxrs + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider ${jackson.version} - - - org.codehaus.jackson - jackson-xc + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations ${jackson.version} - + + org.codehaus.jettison jettison @@ -332,8 +363,7 @@ com.google.code.gson gson - 2.1 - compile + 2.2.4 org.jboss.spec.javax.transaction @@ -576,11 +606,7 @@ jersey-client ${jersey.version} - - com.sun.jersey - jersey-json - ${jersey.version} - + org.ow2.asm asm-all @@ -620,18 +646,29 @@ org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet - 1.17 + ${jersey-servlet.version} org.opendaylight.controller.thirdparty org.apache.catalina.filters.CorsFilter - 7.0.42 + ${corsfilter.version} org.opendaylight.controller.thirdparty ganymed 1.0-SNAPSHOT + + com.google.code.findbugs + jsr305 + 2.0.1 + + + org.opendaylight.yangtools + mockito-configuration + ${yangtools.version} + test + org.opendaylight.yangtools.model @@ -643,6 +680,11 @@ ietf-yang-types ${ietf-yang-types.version} + + org.opendaylight.yangtools.model + ietf-topology + ${ietf-topology.version} + org.opendaylight.yangtools.model opendaylight-l2-types @@ -653,22 +695,18 @@ yang-ext ${yang-ext.version} - + - org.opendaylight.bgpcep - concepts - ${bgpcep.version} + org.opendaylight.controller + protocol-framework + ${protocol-framework.version} - org.opendaylight.bgpcep - util - ${bgpcep.version} + org.opendaylight.yangtools + concepts + ${yangtools.version} - - org.opendaylight.bgpcep - framework - ${bgpcep.version} - + io.netty @@ -700,7 +738,7 @@ org.opendaylight.yangtools yang-binding - ${yangtools.binding.version} + ${yangtools.version} org.opendaylight.yangtools @@ -712,6 +750,11 @@ yang-data-api ${yangtools.version} + + org.opendaylight.yangtools + yang-data-impl + ${yangtools.version} + org.opendaylight.yangtools yang-data-util @@ -722,10 +765,362 @@ yang-model-api ${yangtools.version} + + org.opendaylight.controller + hosttracker + ${hosttracker.api.version} + + + org.opendaylight.controller + hosttracker.implementation + ${hosttracker.implementation.version} + + + org.opendaylight.controller + hosttracker_new + ${hosttracker_new.api.version} + + + 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 + clustering.stub + ${clustering.stub.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 + containermanager + ${containermanager.version} + + + org.opendaylight.controller + containermanager.implementation + ${containermanager.version} + + + org.opendaylight.controller + containermanager.it.implementation + ${containermanager.it.version} + + + org.opendaylight.controller + appauth + ${controller.version} + org.opendaylight.controller switchmanager - 0.5.1-SNAPSHOT + ${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 + ${topologymanager.version} + + + org.opendaylight.controller + usermanager + ${usermanager.version} + + + org.opendaylight.controller + usermanager.implementation + ${usermanager.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} + + + + + 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} + + + + + 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 + ${bundlescanner.version} + + + org.opendaylight.controller + bundlescanner.implementation + ${bundlescanner.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.opendaylight.controller + jolokia-bridge + 0.0.1-SNAPSHOT + + + 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 + protocol_plugins.stub + ${protocol_plugin.stub.version} + + + + + org.opendaylight.controller + samples.loadbalancer + ${samples.loadbalancer} + + + org.opendaylight.controller + samples.loadbalancer.northbound + ${controller.version} + + + org.opendaylight.controller + samples.simpleforwarding + ${controller.version} + + + + + org.opendaylight.controller + clustering.test + ${controller.version} + + + org.opendaylight.controller + commons.httpclient + ${commons.httpclient.version} + + + org.opendaylight.controller + sanitytest + ${controller.version} @@ -753,6 +1148,11 @@ 0.0.1-SNAPSHOT test + + org.codehaus.enunciate + enunciate-core-annotations + ${enunciate.version} + @@ -993,7 +1393,7 @@ true ${project.basedir} **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat - **\/target\/,**\/bin\/ + **\/target\/,**\/bin\/,**\/target-ide\/