X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fpom.xml;h=cdb4e35cdde94678310ac9db4727b79bd60e127a;hb=335aee8c6154a25c76503223e636398d32135bc9;hp=033d0573f9e43b641192856ae62675c5c91a7682;hpb=effdf86b58e39060b75e6090596b123ec6e8ef69;p=controller.git
diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 033d0573f9..cdb4e35cdd 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -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.0-SNAPSHOT
+
+
+ org.opendaylight.yangtools.model
+ ietf-topology
+
+
+ org.opendaylight.controller
+ sal-binding-util
+ 1.0-SNAPSHOT
+
org.opendaylight.controller.md
statistics-manager
@@ -144,10 +166,14 @@
concepts
${concepts.version}
+
+ org.opendaylight.controller
+ protocol-framework
+
org.opendaylight.yangtools
concepts
- 0.1.1-SNAPSHOT
+ ${yangtools.version}
@@ -175,59 +201,60 @@
org.opendaylight.controller
- netty-event-executor-config
+ yang-store-api
${config.version}
org.opendaylight.controller
- netty-threadgroup-config
+ yang-store-impl
${config.version}
org.opendaylight.controller
- threadpool-config-api
+ logback-config
${config.version}
org.opendaylight.controller
- threadpool-config-impl
+ config-persister-api
${config.version}
org.opendaylight.controller
- yang-store-api
+ config-persister-file-adapter
${config.version}
org.opendaylight.controller
- yang-store-api
+ config-persister-file-xml-adapter
${config.version}
org.opendaylight.controller
- yang-store-impl
+ config-persister-directory-adapter
${config.version}
org.opendaylight.controller
- logback-config
+ config-persister-directory-xml-adapter
${config.version}
org.opendaylight.controller
- config-persister-api
+ config-persister-directory-autodetect-adapter
+ ${config.version}
+
+
+
+ org.opendaylight.controller
+ shutdown-api
${config.version}
org.opendaylight.controller
- config-persister-file-adapter
+ shutdown-impl
${config.version}
-
- org.opendaylight.controller
- config-persister-directory-adapter
- ${config.version}
-
@@ -275,6 +302,11 @@
ietf-netconf-monitoring
${netconf.version}
+
+ ${project.groupId}
+ ietf-netconf-monitoring-extension
+ ${netconf.version}
+
org.opendaylight.controller
config-persister-impl
@@ -359,27 +391,27 @@
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
@@ -423,7 +455,6 @@
org.opendaylight.yangtools
yang-data-impl
- 0.5.9-SNAPSHOT
org.opendaylight.yangtools
@@ -449,19 +480,31 @@
org.opendaylight.controller
- zeromq-routingtable.implementation
+ remoterpc-routingtable.implementation
0.4.1-SNAPSHOT
org.zeromq
- jeromq
- 0.3.1
-
+ jeromq
+ 0.3.1
+
+
+
+ org.opendaylight.yangtools.model
+ ietf-inet-types
+
+
+ org.opendaylight.yangtools.model
+ ietf-yang-types
+
+
+ org.opendaylight.yangtools.model
+ opendaylight-l2-types
+
-
integrationtests
false
@@ -470,41 +513,56 @@
org.apache.maven.plugins
- maven-invoker-plugin
- 1.5
+ maven-dependency-plugin
+ 2.8
+
+
+ copy
+ package
+
+ copy
+
+
+
+
+
+
+ org.opendaylight.controller
+ sanitytest
+ jar
+
+
+
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+ 1.2.1
+
+
+ sanity-test
+ package
+
+ exec
+
+
+
- false
- ../sanitytest
-
- pom.xml
-
- true
- true
-
- clean
- verify
-
-
-
-
- integration-test
-
- install
- run
-
-
-
-
+ ${java.home}/bin/java
+
+ -cp
+ ./target/dependency/*
+ org.opendaylight.controller.distribution.Sanity
+
+
+
+ ${java.home}
+
+
+
+
-
-
-
- org.opendaylight.controller
- controller-maven-plugin
- 0.1.0-SNAPSHOT
-
-
@@ -516,135 +574,108 @@
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 +683,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 +702,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 +859,37 @@
ch.qos.logback
logback-classic
+
- org.codehaus.jackson
- jackson-mapper-asl
+ com.fasterxml.jackson.core
+ jackson-databind
+
- org.codehaus.jackson
- jackson-core-asl
+ com.fasterxml.jackson.core
+ jackson-annotations
+
- org.codehaus.jackson
- jackson-jaxrs
+ com.fasterxml.jackson.core
+ jackson-core
+
- org.codehaus.jackson
- jackson-xc
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-json-provider
+
+
+ com.fasterxml.jackson.jaxrs
+ jackson-jaxrs-base
+
+
+
+ com.fasterxml.jackson.module
+ jackson-module-jaxb-annotations
+
+
org.codehaus.jettison
jettison
@@ -1017,8 +1018,6 @@
com.google.code.gson
gson
- 2.2.4
- compile
org.jboss.spec.javax.transaction
@@ -1113,26 +1112,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 +1182,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 +1212,12 @@
org.eclipse.equinox.http
servlet
-
org.apache.felix
org.apache.felix.webconsole
- 4.2.0
all
-
@@ -1269,33 +1237,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
-
@@ -1319,22 +1260,17 @@
netty-common
-
-
+
- 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 +1311,15 @@
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ ${checkstyle.version}
+
+ **\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/
+
+
-