X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=5310db30a74a74e7923409b4bd227190119fcf49;hb=399bedb250471fcdca4d5cdb472b7d9f5f6bac76;hp=f61094ab48c501beb2a8d77b55faf06217d44a0f;hpb=183fa08a5484061c3b77593b1037adfa084158a6;p=controller.git
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index f61094ab48..5310db30a7 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -12,9 +12,6 @@
commons.opendaylight
1.5.0-SNAPSHOT
pom
-
- 3.0
-
@@ -71,7 +68,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,12 +84,12 @@
0.1.0-SNAPSHOT
0.5.0-SNAPSHOT
1.2.0-SNAPSHOT
+ 30-statistics-manager.xml
2.5.0
3.8.0.I20120518-2145
1.3.1
1.28
- 3.0.0
@@ -180,7 +177,6 @@
target/code-coverage/jacoco.exec
target/code-coverage/jacoco-it.exec
org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages
- Sonar way with Findbugs
1.0.0
1.2.1
3.1.4.RELEASE
@@ -207,7 +203,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
@@ -226,6 +221,13 @@
pom
import
+
+ org.opendaylight.controller
+ mdsal-artifacts
+ ${mdsal.version}
+ pom
+ import
+
org.opendaylight.controller
netconf-artifacts
@@ -751,11 +753,6 @@
-
- org.eclipse.xtend
- org.eclipse.xtend.lib
- ${xtend.version}
-
org.glassfish.jersey.test-framework.providers
jersey-test-framework-provider-grizzly2
@@ -1056,155 +1053,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
- 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}
-
-
@@ -1348,77 +1196,7 @@
web
${web.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
@@ -1433,22 +1211,6 @@
xml
runtime
-
- org.opendaylight.controller.samples
- features-toaster
- ${mdsal.version}
- features
- xml
- runtime
-
-
- org.opendaylight.controller
- features-flow
- ${mdsal.version}
- features
- xml
- runtime
-
org.opendaylight.controller.thirdparty
com.sun.jersey.jersey-servlet
@@ -1538,19 +1300,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-protocol-framework
@@ -1585,20 +1334,22 @@
org.opendaylight.controller
- features-mdsal
+ features-netconf-connector
${mdsal.version}
features
xml
runtime
-
+
+
org.opendaylight.controller
- features-netconf-connector
- ${mdsal.version}
+ features-neutron
features
xml
runtime
-
+ ${networkconfig.neutron.version}
+
+
org.openjdk.jmh
@@ -1636,12 +1387,6 @@
maven-clean-plugin
-
- ${xtend.dstdir}
-
- **
-
-
${jmxGeneratorPath}
@@ -1755,7 +1500,6 @@
-
@@ -1897,21 +1641,6 @@
-
- org.eclipse.xtend
- xtend-maven-plugin
- ${xtend.version}
-
-
-
- compile
-
-
- ${xtend.dstdir}
-
-
-
-
org.jacoco
jacoco-maven-plugin
@@ -1972,7 +1701,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\/,**\/src\/main\/resources\/archetype-resources\/**\/*.java
@@ -1996,7 +1725,7 @@
${enforcer.version}
- enforce-java
+ enforce-requirements
enforce
@@ -2005,6 +1734,9 @@
1.7.0
+
+ 3.1.1
+