From: Alexis de Talhouët Date: Mon, 24 Oct 2016 23:48:05 +0000 (-0400) Subject: Revert "Clean-up pom.xml layout" X-Git-Tag: release/carbon~426 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=aa77e20225cc04235315892cf148393149cbf8fc Revert "Clean-up pom.xml layout" Since this got merged, I'm facing issue building the project correctly, it's failing in samples/toaster-it and runtime is broken because of mess-up classpath. If others are facing the same issue, this should be merged. I'll rework the overall patch later. This reverts commit 8a637013c102c11323230dae08fa4407863945d6. Change-Id: I61aae87439736d0163e6b4c49d8753052b28bac0 Signed-off-by: Alexis de Talhouët --- diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index cfff875b8a..1ecc018f1e 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -3,44 +3,17 @@ 4.0.0 - org.opendaylight.odlparent - odlparent + org.opendaylight.controller + commons.opendaylight 1.8.0-SNAPSHOT - + ../commons/opendaylight - org.opendaylight.controller blueprint bundle ${project.artifactId} 0.6.0-SNAPSHOT - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - - com.google.guava diff --git a/opendaylight/commons/filter-valve/pom.xml b/opendaylight/commons/filter-valve/pom.xml index a239795f2a..8e344c91c7 100644 --- a/opendaylight/commons/filter-valve/pom.xml +++ b/opendaylight/commons/filter-valve/pom.xml @@ -8,17 +8,13 @@ --> 4.0.0 - - org.opendaylight.odlparent - odlparent + org.opendaylight.controller + commons.opendaylight 1.8.0-SNAPSHOT - + ../opendaylight - - org.opendaylight.controller filter-valve - 1.8.0-SNAPSHOT bundle @@ -75,6 +71,10 @@ + + org.opendaylight.yangtools + yang-maven-plugin + diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml index 04953a359b..c5da825287 100644 --- a/opendaylight/commons/jolokia/pom.xml +++ b/opendaylight/commons/jolokia/pom.xml @@ -1,15 +1,13 @@ 4.0.0 - - org.opendaylight.odlparent - odlparent + org.opendaylight.controller + commons.opendaylight 1.8.0-SNAPSHOT - + ../opendaylight - org.opendaylight.controller odl-jolokia-osgi 0.5.0-SNAPSHOT jar diff --git a/opendaylight/commons/liblldp/pom.xml b/opendaylight/commons/liblldp/pom.xml index 1f2dce4bdc..d272ecf34e 100644 --- a/opendaylight/commons/liblldp/pom.xml +++ b/opendaylight/commons/liblldp/pom.xml @@ -1,15 +1,13 @@ 4.0.0 - - org.opendaylight.odlparent - odlparent + org.opendaylight.controller + commons.opendaylight 1.8.0-SNAPSHOT - + ../opendaylight - org.opendaylight.controller liblldp 0.12.0-SNAPSHOT bundle @@ -75,6 +73,7 @@ + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/opendaylight/commons/protocol-framework/pom.xml b/opendaylight/commons/protocol-framework/pom.xml index 1780a9acbc..9278cd1247 100644 --- a/opendaylight/commons/protocol-framework/pom.xml +++ b/opendaylight/commons/protocol-framework/pom.xml @@ -3,15 +3,13 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + commons.opendaylight + 1.8.0-SNAPSHOT + ../../commons/opendaylight - org.opendaylight.controller protocol-framework 0.9.0-SNAPSHOT bundle @@ -99,6 +97,16 @@ + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + + + org.apache.maven.plugins maven-jar-plugin @@ -111,31 +119,66 @@ - - - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + + add-source + + generate-sources - -Xdoclint:none + + ${jmxGeneratorPath} + ${salGeneratorPath} + - - - - - - + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + org.opendaylight.controller + yang-jmx-generator-plugin + ${config.version} + + + org.opendaylight.mdsal + maven-sal-api-gen-plugin + ${mdsal.model.version} + + + + + + generate-sources + + + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/opendaylight/config/config-api/pom.xml b/opendaylight/config/config-api/pom.xml index 4e015e10ff..18a6a0c957 100644 --- a/opendaylight/config/config-api/pom.xml +++ b/opendaylight/config/config-api/pom.xml @@ -2,21 +2,29 @@ 4.0.0 - - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + config-subsystem + 0.6.0-SNAPSHOT - - org.opendaylight.controller - 0.6.0-SNAPSHOT + config-api bundle ${project.artifactId} + + com.google.code.findbugs + jsr305 + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.yangtools + yang-common + org.osgi org.osgi.core @@ -31,6 +39,19 @@ + + + + org.apache.felix + maven-bundle-plugin + + + org.opendaylight.yangtools + yang-maven-plugin + + + + diff --git a/opendaylight/config/config-manager-facade-xml/pom.xml b/opendaylight/config/config-manager-facade-xml/pom.xml index 3e4397293a..715a8df168 100644 --- a/opendaylight/config/config-manager-facade-xml/pom.xml +++ b/opendaylight/config/config-manager-facade-xml/pom.xml @@ -4,44 +4,14 @@ 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 - 1.8.0-SNAPSHOT - + config-subsystem + org.opendaylight.controller + 0.6.0-SNAPSHOT - - org.opendaylight.controller - 0.6.0-SNAPSHOT config-manager-facade-xml ${project.artifactId} bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -57,7 +27,8 @@ org.opendaylight.mdsal - mdsal-binding-generator-impl + mdsal-binding-generator-impl + org.slf4j slf4j-api @@ -69,27 +40,6 @@ - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml index 6baf7e1070..802a0b3939 100644 --- a/opendaylight/config/config-manager/pom.xml +++ b/opendaylight/config/config-manager/pom.xml @@ -2,44 +2,15 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + config-subsystem + 0.6.0-SNAPSHOT + .. - - org.opendaylight.controller - 0.6.0-SNAPSHOT config-manager bundle ${project.artifactId} - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - @@ -111,41 +82,11 @@ - org.apache.maven.plugins maven-jar-plugin - - - - test-jar - - package - - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - diff --git a/opendaylight/config/config-persister-api/pom.xml b/opendaylight/config/config-persister-api/pom.xml index ef29d1c6b1..084ccb9c72 100644 --- a/opendaylight/config/config-persister-api/pom.xml +++ b/opendaylight/config/config-persister-api/pom.xml @@ -2,30 +2,15 @@ 4.0.0 - org.opendaylight.odlparent - odlparent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + config-subsystem + 0.6.0-SNAPSHOT + .. - - org.opendaylight.controller - 0.6.0-SNAPSHOT config-persister-api bundle ${project.artifactId} - - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - - ${project.groupId} @@ -43,18 +28,9 @@ org.apache.felix maven-bundle-plugin - org.apache.maven.plugins maven-jar-plugin - - - - test-jar - - package - - diff --git a/opendaylight/config/config-persister-feature-adapter/pom.xml b/opendaylight/config/config-persister-feature-adapter/pom.xml index 552c442e75..7c8a8d7638 100644 --- a/opendaylight/config/config-persister-feature-adapter/pom.xml +++ b/opendaylight/config/config-persister-feature-adapter/pom.xml @@ -4,29 +4,15 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + config-subsystem + 0.6.0-SNAPSHOT + .. - org.opendaylight.controller - 0.6.0-SNAPSHOT config-persister-feature-adapter bundle - - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - - org.osgi diff --git a/opendaylight/config/config-persister-file-xml-adapter/pom.xml b/opendaylight/config/config-persister-file-xml-adapter/pom.xml index 2944fe888d..f3b0f59931 100644 --- a/opendaylight/config/config-persister-file-xml-adapter/pom.xml +++ b/opendaylight/config/config-persister-file-xml-adapter/pom.xml @@ -2,37 +2,15 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + config-subsystem + 0.6.0-SNAPSHOT + .. - - org.opendaylight.controller - 0.6.0-SNAPSHOT config-persister-file-xml-adapter bundle ${project.artifactId} - - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - diff --git a/opendaylight/config/config-util/pom.xml b/opendaylight/config/config-util/pom.xml index 85baebedb7..e82f5dd41b 100644 --- a/opendaylight/config/config-util/pom.xml +++ b/opendaylight/config/config-util/pom.xml @@ -2,37 +2,15 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + config-subsystem + 0.6.0-SNAPSHOT + .. - - org.opendaylight.controller config-util - 0.6.0-SNAPSHOT bundle ${project.artifactId} - - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - @@ -69,14 +47,6 @@ org.apache.maven.plugins maven-jar-plugin - - - - test-jar - - package - - org.apache.felix diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml index 78343ae5f8..d575f35dc8 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml +++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml @@ -2,43 +2,15 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + config-subsystem + 0.6.0-SNAPSHOT + .. - - org.opendaylight.controller - 0.6.0-SNAPSHOT yang-jmx-generator-plugin - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - + ${project.groupId} config-api @@ -76,7 +48,6 @@ org.apache.maven maven-core - 3.3.9 @@ -87,7 +58,6 @@ net.sourceforge.pmd pmd - 5.1.0 test diff --git a/opendaylight/config/yang-jmx-generator/pom.xml b/opendaylight/config/yang-jmx-generator/pom.xml index 36dc24a1bf..d03ea46ffa 100644 --- a/opendaylight/config/yang-jmx-generator/pom.xml +++ b/opendaylight/config/yang-jmx-generator/pom.xml @@ -2,44 +2,16 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + config-subsystem + 0.6.0-SNAPSHOT + ../ - org.opendaylight.controller - 0.6.0-SNAPSHOT yang-jmx-generator bundle ${project.artifactId} - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - ${project.groupId} @@ -95,36 +67,7 @@ org.apache.maven.plugins maven-jar-plugin - - - - test-jar - - package - - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - diff --git a/opendaylight/md-sal/md-sal-config/pom.xml b/opendaylight/md-sal/md-sal-config/pom.xml index c20232dffd..8eb40c91e9 100644 --- a/opendaylight/md-sal/md-sal-config/pom.xml +++ b/opendaylight/md-sal/md-sal-config/pom.xml @@ -9,17 +9,38 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT md-sal-config Configuration files for md-sal jar + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/01-md-sal.xml + xml + config + + + + + + + + diff --git a/opendaylight/md-sal/md-sal-config/src/main/config/default-config.xml b/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml similarity index 100% rename from opendaylight/md-sal/md-sal-config/src/main/config/default-config.xml rename to opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml index 6ae2c15fde..e1b20cbd8d 100644 --- a/opendaylight/md-sal/mdsal-artifacts/pom.xml +++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml @@ -173,13 +173,6 @@ sal-distributed-datastore ${project.version} - - ${project.groupId} - sal-distributed-datastore - ${project.version} - test-jar - test - ${project.groupId} sal-remoterpc-connector @@ -213,6 +206,38 @@ 1.1.0-SNAPSHOT + + + ${project.groupId} + sal-remote + ${project.version} + + + org.opendaylight.controller + sal-rest-connector + ${project.version} + + + org.opendaylight.controller + sal-rest-connector-config + ${project.version} + + + org.opendaylight.controller + sal-restconf-broker + ${project.version} + + + org.opendaylight.controller + sal-rest-docgen + ${project.version} + + + org.opendaylight.controller + sal-rest-docgen-maven + ${project.version} + + org.opendaylight.controller.samples diff --git a/opendaylight/md-sal/messagebus-api/pom.xml b/opendaylight/md-sal/messagebus-api/pom.xml index c89df9b3d5..8f80f0fa52 100644 --- a/opendaylight/md-sal/messagebus-api/pom.xml +++ b/opendaylight/md-sal/messagebus-api/pom.xml @@ -12,36 +12,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - org.opendaylight.controller - 1.5.0-SNAPSHOT messagebus-api ${project.artifactId} - bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - + bundle @@ -60,6 +39,37 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + + + true + + + + org.apache.felix maven-bundle-plugin diff --git a/opendaylight/md-sal/messagebus-config/pom.xml b/opendaylight/md-sal/messagebus-config/pom.xml index bd95d739e8..d49ea75262 100644 --- a/opendaylight/md-sal/messagebus-config/pom.xml +++ b/opendaylight/md-sal/messagebus-config/pom.xml @@ -12,15 +12,62 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - org.opendaylight.controller - 1.5.0-SNAPSHOT messagebus-config jar Configuration files for message-bus + + + org.opendaylight.controller + config-api + + + org.opendaylight.controller + messagebus-api + ${project.version} + + + org.opendaylight.controller + messagebus-impl + ${project.version} + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/05-message-bus.xml + xml + config + + + + + + + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary + diff --git a/opendaylight/md-sal/messagebus-config/src/main/config/default-config.xml b/opendaylight/md-sal/messagebus-config/src/main/resources/initial/05-message-bus.xml similarity index 100% rename from opendaylight/md-sal/messagebus-config/src/main/config/default-config.xml rename to opendaylight/md-sal/messagebus-config/src/main/resources/initial/05-message-bus.xml diff --git a/opendaylight/md-sal/messagebus-impl/pom.xml b/opendaylight/md-sal/messagebus-impl/pom.xml index b4ff2fb01a..900ed6d622 100644 --- a/opendaylight/md-sal/messagebus-impl/pom.xml +++ b/opendaylight/md-sal/messagebus-impl/pom.xml @@ -13,15 +13,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - org.opendaylight.controller - 1.5.0-SNAPSHOT messagebus-impl ${project.artifactId} + bundle @@ -71,7 +69,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 - 2.4 test @@ -80,4 +77,66 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + + + ${project.build.directory}/generated-sources/sal + + + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + + ${project.build.directory}/generated-sources/config + + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + + + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/config + + + + + + + diff --git a/opendaylight/md-sal/messagebus-spi/pom.xml b/opendaylight/md-sal/messagebus-spi/pom.xml index 1588ec8372..c23b97c266 100644 --- a/opendaylight/md-sal/messagebus-spi/pom.xml +++ b/opendaylight/md-sal/messagebus-spi/pom.xml @@ -2,28 +2,14 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - org.opendaylight.controller - 1.5.0-SNAPSHOT messagebus-spi ${project.artifactId} - bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - + bundle @@ -44,27 +30,67 @@ - - - - jdk8 - - [1.8,) - - - + - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + + + ${project.build.directory}/generated-sources/sal + + + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + + ${project.build.directory}/generated-sources/config + + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + + + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/config + + + + + - - - + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/opendaylight/md-sal/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml index faedbe5ff7..6679d3c1d8 100644 --- a/opendaylight/md-sal/messagebus-util/pom.xml +++ b/opendaylight/md-sal/messagebus-util/pom.xml @@ -12,29 +12,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - org.opendaylight.controller - 1.5.0-SNAPSHOT messagebus-util ${project.artifactId} - bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - + bundle @@ -62,7 +48,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 - 2.4 test @@ -71,27 +56,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 463572209b..d00d389eb0 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -3,13 +3,12 @@ 4.0.0 - org.opendaylight.odlparent - odlparent-lite + org.opendaylight.controller + commons.opendaylight 1.8.0-SNAPSHOT - + ../commons/opendaylight - org.opendaylight.controller sal-parent 1.5.0-SNAPSHOT pom @@ -94,6 +93,116 @@ + + + + + org.apache.felix + maven-bundle-plugin + ${bundle.plugin.version} + true + + + + ${project.groupId}.${project.artifactId} + + ${project.basedir}/META-INF + + + + + org.eclipse.m2e + lifecycle-mapping + ${lifecycle.mapping.version} + + + + + + net.alchim31.maven + scala-maven-plugin + [0,) + + compile + testCompile + + + + + + + + + org.jacoco + jacoco-maven-plugin + [0,) + + prepare-agent + + + + + + + + + org.opendaylight.yangtools + yang-maven-plugin + [0.5,) + + generate-sources + + + + + + + + + + + + + + + + org.apache.felix + maven-bundle-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.opendaylight.yangtools + yang-maven-plugin + + + org.opendaylight.controller + yang-jmx-generator-plugin + ${config.version} + + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs.maven.plugin.version} + + Max + Low + site + + + + 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-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml index 1dc0f9e389..315349a90c 100644 --- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml @@ -2,29 +2,13 @@ 4.0.0 - org.opendaylight.odlparent - odlparent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-akka-raft-example bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -54,28 +38,6 @@ - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - 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-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml index 63f163211e..c4943cd272 100644 --- a/opendaylight/md-sal/sal-akka-raft/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft/pom.xml @@ -1,31 +1,14 @@ 4.0.0 - - org.opendaylight.odlparent - odlparent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-akka-raft bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -177,28 +160,6 @@ - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - 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-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml index 852c55f7a3..e8d6a45c1e 100644 --- a/opendaylight/md-sal/sal-binding-api/pom.xml +++ b/opendaylight/md-sal/sal-binding-api/pom.xml @@ -2,43 +2,13 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-binding-api bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - com.google.guava @@ -66,6 +36,12 @@ provided + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + @@ -88,10 +64,4 @@ - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 530b460dc9..1e53fe2073 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -2,43 +2,13 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-binding-broker-impl bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - com.google.guava @@ -176,6 +146,30 @@ + + org.jacoco + jacoco-maven-plugin + + + org.opendaylight.controller.* + + + + + pre-test + + prepare-agent + + + + post-test + + report + + test + + + diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml index 88f59c8df3..a182f9279a 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -1,42 +1,14 @@ 4.0.0 - - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-binding-config bundle - - target/generated-sources/config-binding - - - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -84,21 +56,17 @@ org.opendaylight.yangtools yang-maven-plugin - - - org.opendaylight.controller - yang-jmx-generator-plugin - 0.6.0-SNAPSHOT - - - config generate-sources + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator ${jmxGeneratorPath} @@ -106,6 +74,10 @@ urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + true diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index bb166a9d04..8df8ad59ac 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -3,9 +3,8 @@ 4.0.0 org.opendaylight.controller - mdsal-it-parent + sal-parent 1.5.0-SNAPSHOT - ../mdsal-it-parent sal-binding-dom-it jar @@ -54,6 +53,34 @@ opendaylight-l2-types + + + + org.jacoco + jacoco-maven-plugin + + + org.opendaylight.controller.* + + + + + pre-test + + prepare-agent + + + + post-test + + report + + test + + + + + 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 9692bc15f4..92c0ed71f9 100644 --- a/opendaylight/md-sal/sal-binding-util/pom.xml +++ b/opendaylight/md-sal/sal-binding-util/pom.xml @@ -2,29 +2,13 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-binding-util bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - - com.google.guava diff --git a/opendaylight/md-sal/sal-cluster-admin/pom.xml b/opendaylight/md-sal/sal-cluster-admin/pom.xml index d91577186f..14ccea2972 100644 --- a/opendaylight/md-sal/sal-cluster-admin/pom.xml +++ b/opendaylight/md-sal/sal-cluster-admin/pom.xml @@ -3,13 +3,9 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-cluster-admin bundle @@ -40,6 +36,7 @@ org.opendaylight.controller sal-distributed-datastore test-jar + 1.5.0-SNAPSHOT test @@ -149,6 +146,34 @@ + + org.opendaylight.yangtools + yang-maven-plugin + + + config + + generate-sources + + + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + org.apache.maven.plugins maven-checkstyle-plugin diff --git a/opendaylight/md-sal/sal-clustering-commons/pom.xml b/opendaylight/md-sal/sal-clustering-commons/pom.xml index 73bd2ed8a8..097fdeeaf0 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -3,14 +3,11 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-clustering-commons bundle @@ -142,6 +139,37 @@ + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + + + true + + + + org.jacoco jacoco-maven-plugin @@ -201,27 +229,4 @@ - - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index 596bbe7572..14ee86abf8 100644 --- a/opendaylight/md-sal/sal-clustering-config/pom.xml +++ b/opendaylight/md-sal/sal-clustering-config/pom.xml @@ -11,13 +11,9 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-clustering-config Configuration files for md-sal clustering jar diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml index 7bb362376e..4a59a2123e 100644 --- a/opendaylight/md-sal/sal-common-api/pom.xml +++ b/opendaylight/md-sal/sal-common-api/pom.xml @@ -1,35 +1,15 @@ 4.0.0 - - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - org.opendaylight.controller sal-common-api - 1.5.0-SNAPSHOT bundle - - target/generated-sources/config-binding - - - - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - - com.google.guava @@ -67,58 +47,41 @@ - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin + + + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + - -Xdoclint:none + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + + + true - - - org.opendaylight.yangtools - yang-maven-plugin - - - org.opendaylight.controller - yang-jmx-generator-plugin - 0.6.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 - - - - - - - - + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml index 4ea74bf641..8dbccb1f1a 100644 --- a/opendaylight/md-sal/sal-common-impl/pom.xml +++ b/opendaylight/md-sal/sal-common-impl/pom.xml @@ -2,36 +2,13 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-common-impl bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - com.google.guava diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml index a210272f86..4280e1e2cb 100644 --- a/opendaylight/md-sal/sal-common-util/pom.xml +++ b/opendaylight/md-sal/sal-common-util/pom.xml @@ -2,15 +2,12 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-common-util + bundle @@ -26,7 +23,6 @@ org.opendaylight.controller sal-common-api - ${project.version} org.opendaylight.yangtools @@ -36,35 +32,12 @@ org.opendaylight.yangtools yang-common - + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git HEAD https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml index e4a67dd9cb..6d9173016c 100644 --- a/opendaylight/md-sal/sal-connector-api/pom.xml +++ b/opendaylight/md-sal/sal-connector-api/pom.xml @@ -2,42 +2,13 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-connector-api - bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - + bundle diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index 192672a66b..b944633017 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -3,13 +3,9 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-distributed-datastore bundle @@ -281,30 +277,36 @@ - - - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin + + org.opendaylight.yangtools + yang-maven-plugin + + + config + + generate-sources + - -Xdoclint:none + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true - - - - - + + + + + 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-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml index 80e34ad353..64c0109d5f 100644 --- a/opendaylight/md-sal/sal-dom-api/pom.xml +++ b/opendaylight/md-sal/sal-dom-api/pom.xml @@ -2,36 +2,12 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-core-api bundle - - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -49,6 +25,7 @@ org.osgi org.osgi.core + junit junit @@ -63,28 +40,15 @@ test - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - + + + + org.apache.felix + maven-bundle-plugin + true + + + 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-dom-broker-config/pom.xml b/opendaylight/md-sal/sal-dom-broker-config/pom.xml index 1aef5e8eda..adc40f8ec4 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker-config/pom.xml @@ -1,16 +1,11 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-dom-broker-config bundle @@ -49,6 +44,37 @@ + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + + + true + + + + diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml index e00053231f..2179667f8f 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -2,43 +2,13 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-broker-impl bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 2.2.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.1.0-SNAPSHOT - pom - import - - - - com.google.guava @@ -101,6 +71,7 @@ org.slf4j slf4j-api + org.opendaylight.yangtools mockito-configuration @@ -142,28 +113,6 @@ - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - 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-dom-config/pom.xml b/opendaylight/md-sal/sal-dom-config/pom.xml index 44a6889c87..4a5625e309 100644 --- a/opendaylight/md-sal/sal-dom-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-config/pom.xml @@ -2,39 +2,13 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - sal-dom-config - 1.5.0-SNAPSHOT bundle - - target/generated-sources/config-binding - - - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -70,7 +44,7 @@ com.google.common.base, org.opendaylight.mdsal.eos.common.api, org.opendaylight.mdsal.eos.dom.api, - org.opendaylight.mdsal.singleton.common.api + org.opendaylight.mdsal.singleton.common.api, * @@ -79,21 +53,17 @@ org.opendaylight.yangtools yang-maven-plugin - - - org.opendaylight.controller - yang-jmx-generator-plugin - 0.6.0-SNAPSHOT - - - config generate-sources + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator ${jmxGeneratorPath} @@ -101,6 +71,10 @@ urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl + target/site/models + true diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml index f436c99fca..9a6c53acf4 100644 --- a/opendaylight/md-sal/sal-dom-spi/pom.xml +++ b/opendaylight/md-sal/sal-dom-spi/pom.xml @@ -2,29 +2,13 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-core-spi bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - - org.opendaylight.controller @@ -32,27 +16,6 @@ - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - 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-dom-xsql-config/pom.xml b/opendaylight/md-sal/sal-dom-xsql-config/pom.xml index 5d9ff84c56..4031f7739c 100644 --- a/opendaylight/md-sal/sal-dom-xsql-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-xsql-config/pom.xml @@ -5,29 +5,52 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html ---> - +--> - 4.0.0 - - - org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent - + 4.0.0 + + sal-parent org.opendaylight.controller 1.5.0-SNAPSHOT - sal-dom-xsql-config - Configuration files for md-sal - jar - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary - + + sal-dom-xsql-config + Configuration files for md-sal + jar + + + 04-xsql.xml + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/${configfile} + xml + config + + + + + + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary + diff --git a/opendaylight/md-sal/sal-dom-xsql-config/src/main/config/default-config.xml b/opendaylight/md-sal/sal-dom-xsql-config/src/main/resources/04-xsql.xml similarity index 100% rename from opendaylight/md-sal/sal-dom-xsql-config/src/main/config/default-config.xml rename to opendaylight/md-sal/sal-dom-xsql-config/src/main/resources/04-xsql.xml diff --git a/opendaylight/md-sal/sal-dom-xsql/pom.xml b/opendaylight/md-sal/sal-dom-xsql/pom.xml index d7e9a61c7d..baa14a456a 100644 --- a/opendaylight/md-sal/sal-dom-xsql/pom.xml +++ b/opendaylight/md-sal/sal-dom-xsql/pom.xml @@ -3,13 +3,10 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT + sal-dom-xsql bundle sal-dom-xsql @@ -57,6 +54,50 @@ junit + + + + org.apache.felix + maven-bundle-plugin + + + org.opendaylight.yangtools + yang-maven-plugin + + + org.opendaylight.mdsal + maven-sal-api-gen-plugin + ${mdsal.model.version} + jar + + + + + + generate-sources + + + src/main/yang + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + + + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL:XSQL scm:git:http://git.opendaylight.org/gerrit/controller.git diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml index e43f0bdf00..968a66c182 100644 --- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml @@ -1,15 +1,11 @@ 4.0.0 - - org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent - - + org.opendaylight.controller + sal-parent 1.5.0-SNAPSHOT + sal-dummy-distributed-datastore bundle diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml index 9e5674cdea..af10f62ab9 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -2,39 +2,14 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-inmemory-datastore - bundle - - target/generated-sources/config-binding - - - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.6.0-SNAPSHOT - pom - import - - - + bundle @@ -109,7 +84,6 @@ org.opendaylight.controller sal-dom-config - ${project.version} @@ -194,13 +168,6 @@ org.opendaylight.yangtools yang-maven-plugin - - - org.opendaylight.controller - yang-jmx-generator-plugin - 0.6.0-SNAPSHOT - - config @@ -216,6 +183,10 @@ urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + true diff --git a/opendaylight/md-sal/sal-karaf-xsql/pom.xml b/opendaylight/md-sal/sal-karaf-xsql/pom.xml index f0c124ff78..760db830ac 100644 --- a/opendaylight/md-sal/sal-karaf-xsql/pom.xml +++ b/opendaylight/md-sal/sal-karaf-xsql/pom.xml @@ -21,14 +21,12 @@ 4.0.0 - org.opendaylight.odlparent - odlparent - 1.8.0-SNAPSHOT - - - + sal-parent org.opendaylight.controller 1.5.0-SNAPSHOT + + + org.opendaylight.controller sal-karaf-xsql bundle Apache Karaf :: Shell odl/xsql Commands @@ -39,23 +37,27 @@ org.apache.karaf.shell org.apache.karaf.shell.console + ${karaf.version} org.osgi org.osgi.core + 5.0.0 provided org.osgi org.osgi.compendium + 5.0.0 provided junit junit + 4.11 test @@ -67,9 +69,19 @@ + + maven-compiler-plugin + true + 2.3.2 + + 1.5 + 1.5 + + org.apache.felix maven-bundle-plugin + 2.4.0 true diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml index 80d269058f..de54c31691 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml @@ -3,13 +3,9 @@ 4.0.0 org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../config/config-parent + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-remoterpc-connector bundle @@ -229,30 +225,39 @@ - - - - - - - jdk8 - - [1.8,) - - - - - - org.apache.maven.plugins - maven-javadoc-plugin + + org.opendaylight.yangtools + yang-maven-plugin + + + config + + generate-sources + - -Xdoclint:none + + + org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + ${jmxGeneratorPath} + + urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true - - - - - + + + + + + + + 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-schema-service/pom.xml b/opendaylight/md-sal/sal-schema-service/pom.xml index 34cb65a899..d7ccb5d927 100644 --- a/opendaylight/md-sal/sal-schema-service/pom.xml +++ b/opendaylight/md-sal/sal-schema-service/pom.xml @@ -2,29 +2,13 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT - - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-schema-service bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - - com.google.guava diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml index 140054798d..2c7fce7237 100644 --- a/opendaylight/md-sal/sal-test-model/pom.xml +++ b/opendaylight/md-sal/sal-test-model/pom.xml @@ -2,17 +2,13 @@ - 4.0.0 - - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + sal-parent + org.opendaylight.controller + 1.5.0-SNAPSHOT + 4.0.0 - org.opendaylight.controller - 1.5.0-SNAPSHOT sal-test-model bundle @@ -27,6 +23,56 @@ + + + + org.jacoco + jacoco-maven-plugin + + + org.opendaylight.controller.* + + + + + pre-test + + prepare-agent + + + + post-test + + report + + test + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + + ${salGeneratorPath} + + + true + + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml index afcabaa010..fe1ffe87cf 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml @@ -6,50 +6,45 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + - 4.0.0 + 4.0.0 - org.opendaylight.odlparent - odlparent - 1.8.0-SNAPSHOT - + clustering-it + org.opendaylight.controller.samples + 1.5.0-SNAPSHOT - - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT clustering-it-config - jar - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/initial/module-shards.conf - xml - testmoduleshardconf - - - ${project.build.directory}/classes/initial/modules.conf - xml - testmoduleconf - - - - - - - - + jar + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/initial/module-shards.conf + xml + testmoduleshardconf + + + ${project.build.directory}/classes/initial/modules.conf + xml + testmoduleconf + + + + + + + + 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 f60f4c5832..55fa13c0a7 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml @@ -1,54 +1,15 @@ - + 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + clustering-it + org.opendaylight.controller.samples + 1.5.0-SNAPSHOT - - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT + clustering-it-model bundle - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.10.0-SNAPSHOT - pom - import - - - - - - - org.opendaylight.mdsal - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - org.opendaylight.mdsal.model - yang-ext - - - @@ -63,6 +24,93 @@ + + org.opendaylight.yangtools + yang-maven-plugin + ${yangtools.version} + + + + generate-sources + + + src/main/yang + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + + + org.opendaylight.mdsal + maven-sal-api-gen-plugin + ${mdsal.model.version} + jar + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.opendaylight.yangtools + yang-maven-plugin + [0.5,) + + generate-sources + + + + + + + + + + + + + + + org.opendaylight.mdsal + yang-binding + 0.10.0-SNAPSHOT + + + org.opendaylight.yangtools + yang-common + ${yangtools.version} + + + org.opendaylight.mdsal.model + ietf-inet-types-2013-07-15 + ${ietf-inet-types.version} + + + org.opendaylight.mdsal.model + ietf-yang-types-20130715 + ${ietf-yang-types.version} + + + org.opendaylight.mdsal.model + yang-ext + ${yang-ext.version} + + diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml index 5370c337f7..e5a530c1d8 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml @@ -2,13 +2,10 @@ 4.0.0 - org.opendaylight.odlparent - odlparent-lite - 1.8.0-SNAPSHOT - + org.opendaylight.controller.samples + sal-samples + 1.5.0-SNAPSHOT - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT clustering-it pom 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 d11a5cf056..caa2b1a41a 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml @@ -2,17 +2,24 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../../../config/config-parent + clustering-it + org.opendaylight.controller.samples + 1.5.0-SNAPSHOT - - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT + clustering-it-provider bundle + + + + org.apache.felix + maven-bundle-plugin + true + + + + org.opendaylight.controller.samples diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index 74c4306a3e..50f25be693 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -2,13 +2,12 @@ 4.0.0 - org.opendaylight.odlparent - odlparent - 1.8.0-SNAPSHOT - + org.opendaylight.controller + sal-parent + 1.5.0-SNAPSHOT + org.opendaylight.controller.samples - 1.5.0-SNAPSHOT sal-samples pom diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index 30cef8f27b..e057835754 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -2,33 +2,22 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller.samples + sal-samples + 1.5.0-SNAPSHOT - - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT sample-toaster-consumer bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.5.0-SNAPSHOT - pom - import - - - + + 1.5.0-SNAPSHOT + ${project.groupId} sample-toaster + ${project.version} org.opendaylight.controller diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml index 67a2c00714..de81d9f789 100644 --- a/opendaylight/md-sal/samples/toaster-provider/pom.xml +++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.6.0-SNAPSHOT - ../../../config/config-parent + org.opendaylight.controller.samples + sal-samples + 1.5.0-SNAPSHOT - - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT sample-toaster-provider bundle + + 1.5.0-SNAPSHOT + + ${project.groupId} @@ -66,6 +66,35 @@ + + + + org.apache.felix + maven-bundle-plugin + + + org.opendaylight.yangtools + yang-maven-plugin + + + config + + generate-sources + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml index a77be4fb55..a00cb117fe 100644 --- a/opendaylight/md-sal/samples/toaster/pom.xml +++ b/opendaylight/md-sal/samples/toaster/pom.xml @@ -3,14 +3,12 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.10.0-SNAPSHOT - + org.opendaylight.controller.samples + sal-samples + 1.5.0-SNAPSHOT + - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT sample-toaster bundle @@ -24,4 +22,38 @@ yang-common + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + org.opendaylight.mdsal + maven-sal-api-gen-plugin + ${mdsal.model.version} + jar + + + + + + generate-sources + + + src/main/yang + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + + +