From: Tom Pantelis Date: Mon, 5 Mar 2018 16:49:03 +0000 (-0500) Subject: Create a parent pom for md-sal sub-projects X-Git-Tag: release/fluorine~169 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9f206c90ad2a6a434620f58ca0524c6c683e1eca Create a parent pom for md-sal sub-projects This will contain common configurations for checkstyle and findbugs (once all violations are fixed). Also, isolates the config system dependencies in one place which will make it easier to remove CSS. Change-Id: Ifcf4bcd5e1b96483714bad51858264f511c21237 Signed-off-by: Tom Pantelis --- diff --git a/opendaylight/md-sal/benchmark-data-store/pom.xml b/opendaylight/md-sal/benchmark-data-store/pom.xml index d27d043468..3751a43aad 100644 --- a/opendaylight/md-sal/benchmark-data-store/pom.xml +++ b/opendaylight/md-sal/benchmark-data-store/pom.xml @@ -10,37 +10,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.odlparent - odlparent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent - org.opendaylight.controller benchmark-data-store 1.8.0-SNAPSHOT jar - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.yangtools diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml index c770c2812e..951a509f4b 100644 --- a/opendaylight/md-sal/cds-access-api/pom.xml +++ b/opendaylight/md-sal/cds-access-api/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -14,30 +14,7 @@ 1.4.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - com.typesafe.akka akka-actor_2.12 diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml index b4055cd5bd..35af2a5cea 100644 --- a/opendaylight/md-sal/cds-access-client/pom.xml +++ b/opendaylight/md-sal/cds-access-client/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -14,34 +14,11 @@ 1.4.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller cds-access-api - - com.google.guava - guava - com.typesafe.akka akka-actor_2.12 diff --git a/opendaylight/md-sal/cds-dom-api/pom.xml b/opendaylight/md-sal/cds-dom-api/pom.xml index d359fd672c..20d9f423a7 100644 --- a/opendaylight/md-sal/cds-dom-api/pom.xml +++ b/opendaylight/md-sal/cds-dom-api/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -14,30 +14,7 @@ 1.4.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - com.typesafe.akka akka-actor_2.12 diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index fc95404e3f..b73d604bd8 100644 --- a/opendaylight/md-sal/mdsal-it-parent/pom.xml +++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml @@ -204,7 +204,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.build.directory}/test-classes org.opendaylight.controller - config-it-base,mdsal-it-base + mockito-core,objenesis,config-it-base,mdsal-it-base META-INF\/** false diff --git a/opendaylight/md-sal/mdsal-trace/api/pom.xml b/opendaylight/md-sal/mdsal-trace/api/pom.xml index e833d95c19..c753c46e54 100644 --- a/opendaylight/md-sal/mdsal-trace/api/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/api/pom.xml @@ -10,10 +10,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../parent org.opendaylight.controller @@ -21,18 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - ${project.version} - pom - import - - - - org.opendaylight.controller diff --git a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml index c5f602824d..c390b5f7a8 100644 --- a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml @@ -11,10 +11,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../parent org.opendaylight.controller @@ -22,18 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - ${project.version} - pom - import - - - - ${project.groupId} @@ -45,12 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - junit - junit - test - - org.mockito mockito-core diff --git a/opendaylight/md-sal/mdsal-trace/cli/pom.xml b/opendaylight/md-sal/mdsal-trace/cli/pom.xml index 09d95f9349..60d2d95941 100644 --- a/opendaylight/md-sal/mdsal-trace/cli/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/cli/pom.xml @@ -11,10 +11,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../parent org.opendaylight.controller @@ -22,18 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - ${project.version} - pom - import - - - - ${project.groupId} diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/pom.xml b/opendaylight/md-sal/mdsal-trace/dom-impl/pom.xml index fe3b2ad931..f4a7cb24d5 100644 --- a/opendaylight/md-sal/mdsal-trace/dom-impl/pom.xml +++ b/opendaylight/md-sal/mdsal-trace/dom-impl/pom.xml @@ -11,10 +11,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../parent org.opendaylight.controller @@ -22,25 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - ${project.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - - ${project.groupId} @@ -64,11 +45,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - junit - junit - test - org.mockito mockito-core diff --git a/opendaylight/md-sal/messagebus-api/pom.xml b/opendaylight/md-sal/messagebus-api/pom.xml index f93aea5e01..200567b06c 100644 --- a/opendaylight/md-sal/messagebus-api/pom.xml +++ b/opendaylight/md-sal/messagebus-api/pom.xml @@ -12,10 +12,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -24,18 +24,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle ${project.artifactId} - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller.model diff --git a/opendaylight/md-sal/messagebus-impl/pom.xml b/opendaylight/md-sal/messagebus-impl/pom.xml index c8bc69a8b4..bae2ad723d 100644 --- a/opendaylight/md-sal/messagebus-impl/pom.xml +++ b/opendaylight/md-sal/messagebus-impl/pom.xml @@ -13,9 +13,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller - config-parent - 0.9.0-SNAPSHOT - ../../config/config-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -29,6 +29,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller sal-binding-api + + org.opendaylight.controller + sal-binding-config + org.opendaylight.controller sal-core-api @@ -41,10 +45,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yang-data-impl - - org.opendaylight.controller - config-api - org.opendaylight.controller messagebus-api @@ -57,17 +57,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller messagebus-spi - - org.opendaylight.controller - sal-binding-config - - - junit - junit - test - org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 diff --git a/opendaylight/md-sal/messagebus-spi/pom.xml b/opendaylight/md-sal/messagebus-spi/pom.xml index aabfc04d56..aa9beba2c4 100644 --- a/opendaylight/md-sal/messagebus-spi/pom.xml +++ b/opendaylight/md-sal/messagebus-spi/pom.xml @@ -2,9 +2,9 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.9.0-SNAPSHOT - ../../config/config-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,27 +13,11 @@ ${project.artifactId} bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller messagebus-api - - org.opendaylight.controller - config-api - org.opendaylight.yangtools yang-data-api diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml index a6facd1547..3c8de826ca 100644 --- a/opendaylight/md-sal/messagebus-util/pom.xml +++ b/opendaylight/md-sal/messagebus-util/pom.xml @@ -12,10 +12,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -24,18 +24,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html bundle ${project.artifactId} - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -50,11 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html messagebus-api - - junit - junit - test - org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml new file mode 100644 index 0000000000..321034fab6 --- /dev/null +++ b/opendaylight/md-sal/parent/pom.xml @@ -0,0 +1,130 @@ + + + + 4.0.0 + + org.opendaylight.mdsal + binding-parent + 0.13.0-SNAPSHOT + + + + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + pom + + + ${project.build.directory}/generated-sources/config-binding + + + + + + org.opendaylight.controller + mdsal-artifacts + 1.8.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + config-artifacts + 0.9.0-SNAPSHOT + pom + import + + + + + + + org.opendaylight.yangtools + yang-common + + + org.opendaylight.controller + config-api + + + + + + + org.opendaylight.yangtools + yang-maven-plugin + 2.0.1 + + + org.opendaylight.controller + yang-jmx-generator-plugin + 0.9.0-SNAPSHOT + + + + + config + + generate-sources + + + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + true + + + + + + maven-clean-plugin + + + + ${jmxGeneratorPath} + + ** + + + + ${salGeneratorPath} + + ** + + + + + + + + + + diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 0831fac029..0a616be0ca 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -16,6 +16,7 @@ mdsal-artifacts + parent sal-common-api diff --git a/opendaylight/md-sal/sal-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml index 7ce8c5229f..e851d73cf2 100644 --- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,18 +13,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -35,11 +23,6 @@ org.slf4j slf4j-simple - - - com.google.guava - guava - diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml index a7baa49414..67c99e3d3e 100644 --- a/opendaylight/md-sal/sal-akka-raft/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,27 +13,11 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller sal-clustering-commons - - com.google.guava - guava - com.typesafe.akka @@ -86,12 +70,7 @@ akka-slf4j_2.12 - - - junit - junit - test - + org.mockito mockito-core @@ -104,6 +83,11 @@ test + + com.google.protobuf + protobuf-java + test + diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml index dc0661c9a2..ddfba2b280 100644 --- a/opendaylight/md-sal/sal-binding-api/pom.xml +++ b/opendaylight/md-sal/sal-binding-api/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,37 +13,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - org.opendaylight.controller sal-common-api diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 2f4c529bc2..24bc22893b 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,37 +13,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - org.javassist javassist @@ -102,11 +72,6 @@ org.osgi.core provided - - junit - junit - test - org.mockito mockito-core diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml index f741401445..6caaa6d1f6 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -3,39 +3,16 @@ 4.0.0 org.opendaylight.controller - config-plugin-parent - 0.9.0-SNAPSHOT - ../../config/config-plugin-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent sal-binding-config 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - org.opendaylight.controller - config-api - org.opendaylight.controller sal-binding-api diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index 22d968f905..4831b92d09 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -30,30 +30,6 @@ - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-karaf-resources - - unpack-dependencies - - process-test-resources - - ${project.build.directory}/test-classes - org.opendaylight.controller - mockito-core,objenesis,config-it-base,mdsal-it-base - META-INF\/** - false - - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/opendaylight/md-sal/sal-binding-util/pom.xml b/opendaylight/md-sal/sal-binding-util/pom.xml index d11ad49a59..078001ef52 100644 --- a/opendaylight/md-sal/sal-binding-util/pom.xml +++ b/opendaylight/md-sal/sal-binding-util/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,23 +13,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - org.opendaylight.controller sal-binding-api diff --git a/opendaylight/md-sal/sal-cluster-admin-api/pom.xml b/opendaylight/md-sal/sal-cluster-admin-api/pom.xml index b91618a0d8..b6c0593d94 100644 --- a/opendaylight/md-sal/sal-cluster-admin-api/pom.xml +++ b/opendaylight/md-sal/sal-cluster-admin-api/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml index a6e26e8ff8..616a8ebf83 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml +++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,29 +13,12 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller sal-cluster-admin-api - - junit - junit - test - org.mockito mockito-core @@ -81,12 +64,6 @@ test - - - com.google.guava - guava - - org.scala-lang diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml index bd97395994..d5062e0bfc 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -3,9 +3,9 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.9.0-SNAPSHOT - ../../config/config-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent sal-clustering-commons @@ -14,14 +14,10 @@ - - junit - junit - test - xmlunit xmlunit + test @@ -49,7 +45,11 @@ commons-io test - + + org.apache.commons + commons-lang3 + test + @@ -103,14 +103,6 @@ - - com.google.guava - guava - - - com.google.protobuf - protobuf-java - com.google.guava guava-testlib diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml index 72fb8a2b2a..9d3e2b17ad 100644 --- a/opendaylight/md-sal/sal-common-api/pom.xml +++ b/opendaylight/md-sal/sal-common-api/pom.xml @@ -3,9 +3,9 @@ 4.0.0 org.opendaylight.controller - config-plugin-parent - 0.9.0-SNAPSHOT - ../../config/config-plugin-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -14,14 +14,6 @@ bundle - - com.google.guava - guava - - - org.opendaylight.controller - config-api - org.opendaylight.yangtools concepts diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml index cfd4f2fb70..18684133ab 100644 --- a/opendaylight/md-sal/sal-common-impl/pom.xml +++ b/opendaylight/md-sal/sal-common-impl/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,30 +13,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - org.opendaylight.controller sal-common-api @@ -53,11 +30,6 @@ org.opendaylight.yangtools yang-model-api - - junit - junit - test - org.mockito mockito-core diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml index 1d18165ac4..9573671594 100644 --- a/opendaylight/md-sal/sal-common-util/pom.xml +++ b/opendaylight/md-sal/sal-common-util/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,35 +13,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - - - junit - junit - test - org.opendaylight.controller sal-common-api diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml index 6d83d28772..c6da92c11b 100644 --- a/opendaylight/md-sal/sal-connector-api/pom.xml +++ b/opendaylight/md-sal/sal-connector-api/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,32 +13,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index 2087445d17..f18c6d093a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -3,9 +3,9 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.9.0-SNAPSHOT - ../../config/config-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent sal-distributed-datastore @@ -14,11 +14,6 @@ - - junit - junit - test - org.mockito mockito-core @@ -70,12 +65,6 @@ test - - - com.google.guava - guava - - org.scala-lang @@ -87,10 +76,6 @@ net.java.dev.stax-utils stax-utils - - org.opendaylight.controller - config-api - org.opendaylight.controller sal-akka-raft @@ -161,10 +146,6 @@ org.opendaylight.mdsal mdsal-dom-spi - - org.opendaylight.mdsal - mdsal-dom-inmemory-datastore - org.opendaylight.mdsal mdsal-dom-broker @@ -173,10 +154,6 @@ org.opendaylight.controller sal-core-spi - - org.opendaylight.controller - sal-inmemory-datastore - org.opendaylight.yangtools diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml index ad04c7c49e..64324e5d2f 100644 --- a/opendaylight/md-sal/sal-dom-api/pom.xml +++ b/opendaylight/md-sal/sal-dom-api/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,32 +13,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -56,11 +30,6 @@ org.osgi org.osgi.core - - - junit - junit - org.opendaylight.controller sal-test-model diff --git a/opendaylight/md-sal/sal-dom-broker-config/pom.xml b/opendaylight/md-sal/sal-dom-broker-config/pom.xml index 7ba2437b08..55890c0edc 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker-config/pom.xml @@ -3,9 +3,9 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.9.0-SNAPSHOT - ../../config/config-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent sal-dom-broker-config @@ -13,10 +13,6 @@ bundle - - org.opendaylight.controller - config-api - org.opendaylight.controller sal-dom-config diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml index f2689c48c9..d54c16b32b 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,37 +13,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - com.lmax disruptor @@ -85,10 +55,6 @@ yang-data-impl - - junit - junit - org.slf4j slf4j-api diff --git a/opendaylight/md-sal/sal-dom-config/pom.xml b/opendaylight/md-sal/sal-dom-config/pom.xml index f852dae9d9..11e45c928e 100644 --- a/opendaylight/md-sal/sal-dom-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-config/pom.xml @@ -3,38 +3,15 @@ 4.0.0 org.opendaylight.controller - config-plugin-parent - 0.9.0-SNAPSHOT - ../../config/config-plugin-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent sal-dom-config 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - org.opendaylight.controller - config-api - org.opendaylight.controller sal-common-api diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml index 6bb6b5e801..3df5c87199 100644 --- a/opendaylight/md-sal/sal-dom-spi/pom.xml +++ b/opendaylight/md-sal/sal-dom-spi/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,25 +13,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml index 4e7d466d25..d8490a8428 100644 --- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,24 +13,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - - com.typesafe.akka akka-actor_2.12 @@ -83,11 +66,6 @@ - - junit - junit - test - org.mockito mockito-core diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml index 34c99363ea..8312c233fa 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -3,47 +3,16 @@ 4.0.0 org.opendaylight.controller - config-plugin-parent - 0.9.0-SNAPSHOT - ../../config/config-plugin-parent + mdsal-parent + 1.8.0-SNAPSHOT + ../parent sal-inmemory-datastore 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - - diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml index d38c499df0..b6be74ded8 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -14,30 +14,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - - - - com.google.guava - guava - com.typesafe.akka akka-actor_2.12 @@ -132,11 +109,6 @@ 3.1.2 - - junit - junit - test - org.mockito mockito-core diff --git a/opendaylight/md-sal/sal-schema-service/pom.xml b/opendaylight/md-sal/sal-schema-service/pom.xml index e245099a64..7bbd3362e6 100644 --- a/opendaylight/md-sal/sal-schema-service/pom.xml +++ b/opendaylight/md-sal/sal-schema-service/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller @@ -13,30 +13,7 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - - - com.google.guava - guava - org.opendaylight.controller sal-core-api diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml index bb2b1406b0..ac2d9a0d5c 100644 --- a/opendaylight/md-sal/sal-test-model/pom.xml +++ b/opendaylight/md-sal/sal-test-model/pom.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../parent org.opendaylight.controller diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml index 42a46ef719..4cf6a9499b 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml @@ -3,10 +3,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../../parent org.opendaylight.controller.samples diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml index 6ebb920278..e8a9546943 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../../parent org.opendaylight.controller.samples @@ -13,18 +13,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller.samples diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index da3b0fc537..342365f686 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../parent org.opendaylight.controller.samples @@ -13,22 +13,6 @@ 1.8.0-SNAPSHOT bundle - - 1.8.0-SNAPSHOT - - - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - ${project.groupId} diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml index e1899ceba3..1c255f1e55 100644 --- a/opendaylight/md-sal/samples/toaster-provider/pom.xml +++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../parent org.opendaylight.controller.samples @@ -13,18 +13,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - ${project.groupId} @@ -56,22 +44,12 @@ test-jar test - - junit - junit - test - org.mockito mockito-core test - - - com.google.guava - guava - diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml index a8671dabce..001148defd 100644 --- a/opendaylight/md-sal/samples/toaster/pom.xml +++ b/opendaylight/md-sal/samples/toaster/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.controller + mdsal-parent + 1.8.0-SNAPSHOT + ../../parent org.opendaylight.controller.samples