X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=8596412de8f652e50eebb1ff15e84173b329bbf7;hp=23542dd62b897f74b58654f7c59295a86e28f04a;hb=191ad68d71f30f6ad6258ac458c60c663e5b1b85;hpb=e9e0f06353156479480045bd0764588067e6a394 diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 23542dd62b..8596412de8 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -71,7 +71,7 @@ etc/opendaylight/karaf 05-clustering.xml 00-netty.xml - 01-mdsal.xml + 01-md-sal.xml 04-xsql.xml 01-netconf.xml 03-toaster-sample.xml @@ -87,6 +87,7 @@ 0.1.0-SNAPSHOT 0.5.0-SNAPSHOT 1.2.0-SNAPSHOT + 30-statistics-manager.xml 2.5.0 3.8.0.I20120518-2145 @@ -106,7 +107,6 @@ 0.5.0-SNAPSHOT 0.5.0-SNAPSHOT 0.7.0-SNAPSHOT - 1.2.0-SNAPSHOT 0.6.0-SNAPSHOT 0.6.0-SNAPSHOT 0.5.0-SNAPSHOT @@ -180,7 +180,7 @@ java target/code-coverage/jacoco.exec target/code-coverage/jacoco-it.exec - org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages,ch.ethz.ssh2 + org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages Sonar way with Findbugs 1.0.0 1.2.1 @@ -208,7 +208,6 @@ 0.5.0-SNAPSHOT 0.5.0-SNAPSHOT 0.5.0-SNAPSHOT - src/main/xtend-gen 2013.09.07.7-SNAPSHOT 1.1.0-SNAPSHOT 0.7.0-SNAPSHOT @@ -220,6 +219,20 @@ + + org.opendaylight.controller + config-artifacts + ${config.version} + pom + import + + + org.opendaylight.controller + mdsal-artifacts + ${mdsal.version} + pom + import + org.opendaylight.controller netconf-artifacts @@ -227,6 +240,7 @@ pom import + org.apache.sshd sshd-core @@ -744,11 +758,6 @@ - - org.eclipse.xtend - org.eclipse.xtend.lib - ${xtend.version} - org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 @@ -840,60 +849,6 @@ - - org.opendaylight.controller - config-api - ${config.version} - - - org.opendaylight.controller - config-manager - ${config.version} - test-jar - - - org.opendaylight.controller - config-manager - ${config.version} - - - org.opendaylight.controller - config-persister-api - ${config.version} - test-jar - - - org.opendaylight.controller - config-persister-api - ${config.version} - - - org.opendaylight.controller - config-persister-directory-xml-adapter - ${config.version} - - - org.opendaylight.controller - config-persister-file-xml-adapter - ${config.version} - - - org.opendaylight.controller - config-persister-feature-adapter - ${config.version} - - - - org.opendaylight.controller - config-util - ${config.version} - - - org.opendaylight.controller - config-util - ${config.version} - test-jar - org.opendaylight.controller configuration @@ -1036,11 +991,6 @@ liblldp ${sal.version} - - org.opendaylight.controller - logback-config - ${config.version} - org.opendaylight.controller @@ -1053,26 +1003,6 @@ ${dummy-console.version} - - org.opendaylight.controller - netty-config-api - ${config.version} - - - org.opendaylight.controller - netty-event-executor-config - ${config.version} - - - org.opendaylight.controller - netty-threadgroup-config - ${config.version} - - - org.opendaylight.controller - netty-timer-config - ${config.version} - org.opendaylight.controller networkconfig.bridgedomain.northbound @@ -1128,160 +1058,6 @@ sal ${sal.version} - - org.opendaylight.controller - sal-binding-api - ${mdsal.version} - - - org.opendaylight.controller - sal-binding-broker-impl - ${mdsal.version} - - - org.opendaylight.controller - sal-binding-config - ${mdsal.version} - - - org.opendaylight.controller - sal-binding-util - ${mdsal.version} - - - org.opendaylight.controller - sal-broker-impl - ${mdsal.version} - - - org.opendaylight.controller - sal-common - ${mdsal.version} - - - org.opendaylight.controller - sal-common-api - ${mdsal.version} - - - org.opendaylight.controller - sal-common-impl - ${mdsal.version} - - - org.opendaylight.controller - sal-common-util - ${mdsal.version} - - - org.opendaylight.controller - sal-inmemory-datastore - ${mdsal.version} - - - org.opendaylight.controller - sal-compatibility - ${mdsal.version} - - - org.opendaylight.controller - sal-connector-api - ${mdsal.version} - - - org.opendaylight.controller - sal-dom-xsql - ${mdsal.version} - - - org.opendaylight.controller - sal-karaf-xsql - ${mdsal.version} - - - org.opendaylight.controller - sal-dom-xsql-config - ${mdsal.version} - config - xml - - - org.opendaylight.controller - sal-core-api - ${mdsal.version} - - - org.opendaylight.controller - sal-core-spi - ${mdsal.version} - - - org.opendaylight.controller - sal-netconf-connector - ${mdsal.version} - - - org.opendaylight.controller - sal-remote - ${mdsal.version} - - - org.opendaylight.controller - sal-rest-connector - ${mdsal.version} - - - org.opendaylight.controller - sal-rest-connector-config - ${mdsal.version} - - - org.opendaylight.controller - config-netty-config - ${config.version} - - - org.opendaylight.controller - md-sal-config - ${mdsal.version} - - - org.opendaylight.controller - sal-rest-docgen - ${mdsal.version} - - - org.opendaylight.controller - sal-restconf-broker - ${mdsal.version} - - - org.opendaylight.controller - sal-test-model - ${mdsal.version} - - - org.opendaylight.controller - sal-distributed-datastore - ${mdsal.version} - - - org.opendaylight.controller - sal-clustering-commons - ${mdsal.version} - - - org.opendaylight.controller - sal-clustering-config - ${mdsal.version} - - - - org.opendaylight.controller - sal-remoterpc-connector - ${mdsal.version} - - @@ -1342,16 +1118,6 @@ ${karaf.security.version} - - org.opendaylight.controller - shutdown-api - ${config.version} - - - org.opendaylight.controller - shutdown-impl - ${config.version} - org.opendaylight.controller statistics.northbound @@ -1388,17 +1154,6 @@ ${switchmanager.northbound.version} - - - org.opendaylight.controller - threadpool-config-api - ${config.version} - - - org.opendaylight.controller - threadpool-config-impl - ${config.version} - org.opendaylight.controller topology.northbound @@ -1446,93 +1201,7 @@ web ${web.version} - - org.opendaylight.controller - yang-jmx-generator - ${config.version} - - - org.opendaylight.controller - yang-jmx-generator - ${config.version} - test-jar - - - org.opendaylight.controller - yang-test - ${config.version} - - - org.opendaylight.controller.md - forwardingrules-manager - ${mdsal.version} - - - org.opendaylight.controller.md - inventory-manager - ${mdsal.version} - - - org.opendaylight.controller.md - statistics-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-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-inventory - ${mdsal.version} - - - org.opendaylight.controller.model - model-topology - ${mdsal.version} - - - org.opendaylight.controller.samples - sample-toaster - ${mdsal.version} - - - org.opendaylight.controller.samples - sample-toaster-consumer - ${mdsal.version} - - - org.opendaylight.controller.samples - sample-toaster-provider - ${mdsal.version} - - - org.opendaylight.controller.samples - toaster-config - ${mdsal.version} - org.opendaylight.yangtools features-test @@ -1547,40 +1216,11 @@ xml runtime - - org.opendaylight.controller.samples - features-toaster - ${mdsal.version} - features - xml - runtime - - - org.opendaylight.controller - features-config-netty - ${config.version} - features - xml - runtime - - - org.opendaylight.controller - features-flow - ${mdsal.version} - features - xml - runtime - org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet ${jersey-servlet.version} - - org.opendaylight.controller.thirdparty - ganymed - ${ganymed.version} - @@ -1665,27 +1305,6 @@ 0.1.0-SNAPSHOT test - - org.opendaylight.controller - sal-binding-broker-impl - ${mdsal.version} - test-jar - test - - - org.opendaylight.controller - sal-binding-it - ${mdsal.version} - test - - - org.opendaylight.controller - features-config - ${config.version} - features - xml - runtime - org.opendaylight.controller features-protocol-framework @@ -1694,22 +1313,6 @@ xml runtime - - org.opendaylight.controller - features-config-persister - ${config.version} - features - xml - runtime - - - org.opendaylight.controller - config-netty-features - ${config.version} - features - xml - runtime - org.opendaylight.controller features-base @@ -1735,21 +1338,14 @@ runtime - org.opendaylight.controller - features-mdsal - ${mdsal.version} - features - xml - runtime - - org.opendaylight.controller features-netconf-connector ${mdsal.version} features xml runtime - + + org.openjdk.jmh @@ -1787,12 +1383,6 @@ maven-clean-plugin - - ${xtend.dstdir} - - ** - - ${jmxGeneratorPath} @@ -1906,7 +1496,6 @@ src/main/yang ${jmxGeneratorPath} ${salGeneratorPath} - ${xtend.dstdir} @@ -2048,21 +1637,6 @@ - - org.eclipse.xtend - xtend-maven-plugin - ${xtend.version} - - - - compile - - - ${xtend.dstdir} - - - - org.jacoco jacoco-maven-plugin @@ -2116,7 +1690,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - ${checkstyle.version} true controller/checkstyle.xml @@ -2124,7 +1697,7 @@ true ${project.basedir} **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat - **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/xtend-gen\/,**\/protobuff\/ + **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/protobuff\/ @@ -2202,7 +1775,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${surefire.version} ${testvm.argLine} ${jacoco.agent.ut.arg}