From: Alexis de Talhouët Date: Fri, 7 Oct 2016 21:26:17 +0000 (-0400) Subject: Clean-up pom.xml layout X-Git-Tag: release/carbon~427 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=8a637013c102c11323230dae08fa4407863945d6 Clean-up pom.xml layout Do not depend on opendaylight/commons/opendaylight/pom.xml Change-Id: Ic7313dc6b703739a6c14b1f0cd1a37ba3b7827af Signed-off-by: Alexis de Talhouët --- diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 1ecc018f1e..cfff875b8a 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -3,17 +3,44 @@ 4.0.0 - org.opendaylight.controller - commons.opendaylight + org.opendaylight.odlparent + odlparent 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 8e344c91c7..a239795f2a 100644 --- a/opendaylight/commons/filter-valve/pom.xml +++ b/opendaylight/commons/filter-valve/pom.xml @@ -8,13 +8,17 @@ --> 4.0.0 + - org.opendaylight.controller - commons.opendaylight + org.opendaylight.odlparent + odlparent 1.8.0-SNAPSHOT - ../opendaylight + + + org.opendaylight.controller filter-valve + 1.8.0-SNAPSHOT bundle @@ -71,10 +75,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/opendaylight/commons/jolokia/pom.xml b/opendaylight/commons/jolokia/pom.xml index c5da825287..04953a359b 100644 --- a/opendaylight/commons/jolokia/pom.xml +++ b/opendaylight/commons/jolokia/pom.xml @@ -1,13 +1,15 @@ 4.0.0 + - org.opendaylight.controller - commons.opendaylight + org.opendaylight.odlparent + odlparent 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 d272ecf34e..1f2dce4bdc 100644 --- a/opendaylight/commons/liblldp/pom.xml +++ b/opendaylight/commons/liblldp/pom.xml @@ -1,13 +1,15 @@ 4.0.0 + - org.opendaylight.controller - commons.opendaylight + org.opendaylight.odlparent + odlparent 1.8.0-SNAPSHOT - ../opendaylight + + org.opendaylight.controller liblldp 0.12.0-SNAPSHOT bundle @@ -73,7 +75,6 @@ - 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 9278cd1247..1780a9acbc 100644 --- a/opendaylight/commons/protocol-framework/pom.xml +++ b/opendaylight/commons/protocol-framework/pom.xml @@ -3,13 +3,15 @@ 4.0.0 + org.opendaylight.controller - commons.opendaylight - 1.8.0-SNAPSHOT - ../../commons/opendaylight + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + org.opendaylight.controller protocol-framework 0.9.0-SNAPSHOT bundle @@ -97,16 +99,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - org.apache.maven.plugins maven-jar-plugin @@ -119,66 +111,31 @@ - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - - add-source - - generate-sources - - - ${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 - - - - + + + + + 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/config/config-api/pom.xml b/opendaylight/config/config-api/pom.xml index 18a6a0c957..4e015e10ff 100644 --- a/opendaylight/config/config-api/pom.xml +++ b/opendaylight/config/config-api/pom.xml @@ -2,29 +2,21 @@ 4.0.0 + - org.opendaylight.controller - config-subsystem - 0.6.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 @@ -39,19 +31,6 @@ - - - - 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 715a8df168..3e4397293a 100644 --- a/opendaylight/config/config-manager-facade-xml/pom.xml +++ b/opendaylight/config/config-manager-facade-xml/pom.xml @@ -4,14 +4,44 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - config-subsystem - org.opendaylight.controller - 0.6.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.8.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 @@ -27,8 +57,7 @@ org.opendaylight.mdsal - mdsal-binding-generator-impl - + mdsal-binding-generator-impl org.slf4j slf4j-api @@ -40,6 +69,27 @@ + + + + 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 802a0b3939..6baf7e1070 100644 --- a/opendaylight/config/config-manager/pom.xml +++ b/opendaylight/config/config-manager/pom.xml @@ -2,15 +2,44 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.6.0-SNAPSHOT - .. + org.opendaylight.odlparent + bundle-parent + 1.8.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 + + + + @@ -82,11 +111,41 @@ + 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 084ccb9c72..ef29d1c6b1 100644 --- a/opendaylight/config/config-persister-api/pom.xml +++ b/opendaylight/config/config-persister-api/pom.xml @@ -2,15 +2,30 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.6.0-SNAPSHOT - .. + org.opendaylight.odlparent + odlparent + 1.8.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} @@ -28,9 +43,18 @@ 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 7c8a8d7638..552c442e75 100644 --- a/opendaylight/config/config-persister-feature-adapter/pom.xml +++ b/opendaylight/config/config-persister-feature-adapter/pom.xml @@ -4,15 +4,29 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.6.0-SNAPSHOT - .. + org.opendaylight.odlparent + bundle-parent + 1.8.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 f3b0f59931..2944fe888d 100644 --- a/opendaylight/config/config-persister-file-xml-adapter/pom.xml +++ b/opendaylight/config/config-persister-file-xml-adapter/pom.xml @@ -2,15 +2,37 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.6.0-SNAPSHOT - .. + org.opendaylight.odlparent + bundle-parent + 1.8.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 e82f5dd41b..85baebedb7 100644 --- a/opendaylight/config/config-util/pom.xml +++ b/opendaylight/config/config-util/pom.xml @@ -2,15 +2,37 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.6.0-SNAPSHOT - .. + org.opendaylight.odlparent + bundle-parent + 1.8.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 + + + + @@ -47,6 +69,14 @@ 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 d575f35dc8..78343ae5f8 100644 --- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml +++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml @@ -2,15 +2,43 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.6.0-SNAPSHOT - .. + org.opendaylight.odlparent + bundle-parent + 1.8.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 @@ -48,6 +76,7 @@ org.apache.maven maven-core + 3.3.9 @@ -58,6 +87,7 @@ 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 d03ea46ffa..36dc24a1bf 100644 --- a/opendaylight/config/yang-jmx-generator/pom.xml +++ b/opendaylight/config/yang-jmx-generator/pom.xml @@ -2,16 +2,44 @@ 4.0.0 - org.opendaylight.controller - config-subsystem - 0.6.0-SNAPSHOT - ../ + org.opendaylight.odlparent + bundle-parent + 1.8.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} @@ -67,7 +95,36 @@ 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 8eb40c91e9..c20232dffd 100644 --- a/opendaylight/md-sal/md-sal-config/pom.xml +++ b/opendaylight/md-sal/md-sal-config/pom.xml @@ -9,38 +9,17 @@ 4.0.0 + org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + + 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/resources/initial/01-md-sal.xml b/opendaylight/md-sal/md-sal-config/src/main/config/default-config.xml similarity index 100% rename from opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml rename to opendaylight/md-sal/md-sal-config/src/main/config/default-config.xml diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml index e1b20cbd8d..6ae2c15fde 100644 --- a/opendaylight/md-sal/mdsal-artifacts/pom.xml +++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml @@ -173,6 +173,13 @@ sal-distributed-datastore ${project.version} + + ${project.groupId} + sal-distributed-datastore + ${project.version} + test-jar + test + ${project.groupId} sal-remoterpc-connector @@ -206,38 +213,6 @@ 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 8f80f0fa52..c89df9b3d5 100644 --- a/opendaylight/md-sal/messagebus-api/pom.xml +++ b/opendaylight/md-sal/messagebus-api/pom.xml @@ -12,16 +12,37 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 + + + + org.opendaylight.controller.model @@ -39,37 +60,6 @@ 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 d49ea75262..bd95d739e8 100644 --- a/opendaylight/md-sal/messagebus-config/pom.xml +++ b/opendaylight/md-sal/messagebus-config/pom.xml @@ -12,62 +12,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + 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/resources/initial/05-message-bus.xml b/opendaylight/md-sal/messagebus-config/src/main/config/default-config.xml similarity index 100% rename from opendaylight/md-sal/messagebus-config/src/main/resources/initial/05-message-bus.xml rename to opendaylight/md-sal/messagebus-config/src/main/config/default-config.xml diff --git a/opendaylight/md-sal/messagebus-impl/pom.xml b/opendaylight/md-sal/messagebus-impl/pom.xml index 900ed6d622..b4ff2fb01a 100644 --- a/opendaylight/md-sal/messagebus-impl/pom.xml +++ b/opendaylight/md-sal/messagebus-impl/pom.xml @@ -13,13 +13,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + org.opendaylight.controller + 1.5.0-SNAPSHOT messagebus-impl ${project.artifactId} - bundle @@ -69,6 +71,7 @@ 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 @@ -77,66 +80,4 @@ 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 c23b97c266..1588ec8372 100644 --- a/opendaylight/md-sal/messagebus-spi/pom.xml +++ b/opendaylight/md-sal/messagebus-spi/pom.xml @@ -2,15 +2,29 @@ 4.0.0 org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + org.opendaylight.controller + 1.5.0-SNAPSHOT messagebus-spi ${project.artifactId} - bundle + + + + org.opendaylight.controller + mdsal-artifacts + 1.5.0-SNAPSHOT + pom + import + + + + org.opendaylight.controller @@ -30,67 +44,27 @@ - + + + + jdk8 + + [1.8,) + + + - - 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 - - - - - + + 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/messagebus-util/pom.xml b/opendaylight/md-sal/messagebus-util/pom.xml index 6679d3c1d8..faedbe5ff7 100644 --- a/opendaylight/md-sal/messagebus-util/pom.xml +++ b/opendaylight/md-sal/messagebus-util/pom.xml @@ -12,16 +12,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 + + + + org.osgi @@ -48,6 +62,7 @@ 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 @@ -56,4 +71,27 @@ 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 d00d389eb0..463572209b 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -3,12 +3,13 @@ 4.0.0 - org.opendaylight.controller - commons.opendaylight + org.opendaylight.odlparent + odlparent-lite 1.8.0-SNAPSHOT - ../commons/opendaylight + + org.opendaylight.controller sal-parent 1.5.0-SNAPSHOT pom @@ -93,116 +94,6 @@ - - - - - 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 315349a90c..1dc0f9e389 100644 --- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml @@ -2,13 +2,29 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.8.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 @@ -38,6 +54,28 @@ + + + + + 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 c4943cd272..63f163211e 100644 --- a/opendaylight/md-sal/sal-akka-raft/pom.xml +++ b/opendaylight/md-sal/sal-akka-raft/pom.xml @@ -1,14 +1,31 @@ 4.0.0 + - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.8.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 @@ -160,6 +177,28 @@ + + + + + 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 e8d6a45c1e..852c55f7a3 100644 --- a/opendaylight/md-sal/sal-binding-api/pom.xml +++ b/opendaylight/md-sal/sal-binding-api/pom.xml @@ -2,13 +2,43 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.8.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 @@ -36,12 +66,6 @@ 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 - @@ -64,4 +88,10 @@ + + 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 1e53fe2073..530b460dc9 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -2,13 +2,43 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.8.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 @@ -146,30 +176,6 @@ - - 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 a182f9279a..88f59c8df3 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -1,14 +1,42 @@ 4.0.0 + - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 @@ -56,17 +84,21 @@ 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} @@ -74,10 +106,6 @@ 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 8df8ad59ac..bb166a9d04 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -3,8 +3,9 @@ 4.0.0 org.opendaylight.controller - sal-parent + mdsal-it-parent 1.5.0-SNAPSHOT + ../mdsal-it-parent sal-binding-dom-it jar @@ -53,34 +54,6 @@ 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 92c0ed71f9..9692bc15f4 100644 --- a/opendaylight/md-sal/sal-binding-util/pom.xml +++ b/opendaylight/md-sal/sal-binding-util/pom.xml @@ -2,13 +2,29 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.8.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 14ccea2972..d91577186f 100644 --- a/opendaylight/md-sal/sal-cluster-admin/pom.xml +++ b/opendaylight/md-sal/sal-cluster-admin/pom.xml @@ -3,9 +3,13 @@ 4.0.0 org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + + org.opendaylight.controller + 1.5.0-SNAPSHOT sal-cluster-admin bundle @@ -36,7 +40,6 @@ org.opendaylight.controller sal-distributed-datastore test-jar - 1.5.0-SNAPSHOT test @@ -146,34 +149,6 @@ - - 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 097fdeeaf0..73bd2ed8a8 100644 --- a/opendaylight/md-sal/sal-clustering-commons/pom.xml +++ b/opendaylight/md-sal/sal-clustering-commons/pom.xml @@ -3,11 +3,14 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + org.opendaylight.controller + 1.5.0-SNAPSHOT sal-clustering-commons bundle @@ -139,37 +142,6 @@ - - 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 @@ -229,4 +201,27 @@ + + + + + + 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 14ee86abf8..596bbe7572 100644 --- a/opendaylight/md-sal/sal-clustering-config/pom.xml +++ b/opendaylight/md-sal/sal-clustering-config/pom.xml @@ -11,9 +11,13 @@ 4.0.0 org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + + 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 4a59a2123e..7bb362376e 100644 --- a/opendaylight/md-sal/sal-common-api/pom.xml +++ b/opendaylight/md-sal/sal-common-api/pom.xml @@ -1,15 +1,35 @@ 4.0.0 + - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 @@ -47,41 +67,58 @@ - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - + + + + jdk8 + + [1.8,) + + + + + + org.apache.maven.plugins + maven-javadoc-plugin - - - 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 + -Xdoclint:none - - - - - + + + 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 8dbccb1f1a..4ea74bf641 100644 --- a/opendaylight/md-sal/sal-common-impl/pom.xml +++ b/opendaylight/md-sal/sal-common-impl/pom.xml @@ -2,13 +2,36 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.8.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 4280e1e2cb..a210272f86 100644 --- a/opendaylight/md-sal/sal-common-util/pom.xml +++ b/opendaylight/md-sal/sal-common-util/pom.xml @@ -2,12 +2,15 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.0-SNAPSHOT + - sal-common-util + org.opendaylight.controller + 1.5.0-SNAPSHOT + sal-common-util bundle @@ -23,6 +26,7 @@ org.opendaylight.controller sal-common-api + ${project.version} org.opendaylight.yangtools @@ -32,12 +36,35 @@ 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 6d9173016c..e4a67dd9cb 100644 --- a/opendaylight/md-sal/sal-connector-api/pom.xml +++ b/opendaylight/md-sal/sal-connector-api/pom.xml @@ -2,14 +2,43 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.8.0-SNAPSHOT + - sal-connector-api + 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 + + + + org.opendaylight.controller diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml index b944633017..192672a66b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml @@ -3,9 +3,13 @@ 4.0.0 org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + + org.opendaylight.controller + 1.5.0-SNAPSHOT sal-distributed-datastore bundle @@ -277,36 +281,30 @@ - - 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 - - - - + + + + + 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-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml index 64c0109d5f..80e34ad353 100644 --- a/opendaylight/md-sal/sal-dom-api/pom.xml +++ b/opendaylight/md-sal/sal-dom-api/pom.xml @@ -2,12 +2,36 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.8.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 @@ -25,7 +49,6 @@ org.osgi org.osgi.core - junit junit @@ -40,15 +63,28 @@ test - - - - org.apache.felix - maven-bundle-plugin - true - - - + + + + + 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-broker-config/pom.xml b/opendaylight/md-sal/sal-dom-broker-config/pom.xml index adc40f8ec4..1aef5e8eda 100644 --- a/opendaylight/md-sal/sal-dom-broker-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker-config/pom.xml @@ -1,11 +1,16 @@ 4.0.0 + org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + + org.opendaylight.controller + 1.5.0-SNAPSHOT sal-dom-broker-config bundle @@ -44,37 +49,6 @@ - - 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 2179667f8f..e00053231f 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -2,13 +2,43 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.8.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 @@ -71,7 +101,6 @@ org.slf4j slf4j-api - org.opendaylight.yangtools mockito-configuration @@ -113,6 +142,28 @@ + + + + + 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 4a5625e309..44a6889c87 100644 --- a/opendaylight/md-sal/sal-dom-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-config/pom.xml @@ -2,13 +2,39 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 @@ -44,7 +70,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 * @@ -53,17 +79,21 @@ 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} @@ -71,10 +101,6 @@ 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 9a6c53acf4..f436c99fca 100644 --- a/opendaylight/md-sal/sal-dom-spi/pom.xml +++ b/opendaylight/md-sal/sal-dom-spi/pom.xml @@ -2,13 +2,29 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 @@ -16,6 +32,27 @@ + + + + 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 4031f7739c..5d9ff84c56 100644 --- a/opendaylight/md-sal/sal-dom-xsql-config/pom.xml +++ b/opendaylight/md-sal/sal-dom-xsql-config/pom.xml @@ -5,52 +5,29 @@ 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 + 4.0.0 + + + org.opendaylight.controller + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + - - sal-parent org.opendaylight.controller 1.5.0-SNAPSHOT - - 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 - + 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 + diff --git a/opendaylight/md-sal/sal-dom-xsql-config/src/main/resources/04-xsql.xml b/opendaylight/md-sal/sal-dom-xsql-config/src/main/config/default-config.xml similarity index 100% rename from opendaylight/md-sal/sal-dom-xsql-config/src/main/resources/04-xsql.xml rename to opendaylight/md-sal/sal-dom-xsql-config/src/main/config/default-config.xml diff --git a/opendaylight/md-sal/sal-dom-xsql/pom.xml b/opendaylight/md-sal/sal-dom-xsql/pom.xml index baa14a456a..d7e9a61c7d 100644 --- a/opendaylight/md-sal/sal-dom-xsql/pom.xml +++ b/opendaylight/md-sal/sal-dom-xsql/pom.xml @@ -3,10 +3,13 @@ 4.0.0 org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent - + + org.opendaylight.controller + 1.5.0-SNAPSHOT sal-dom-xsql bundle sal-dom-xsql @@ -54,50 +57,6 @@ 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 968a66c182..e43f0bdf00 100644 --- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml +++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml @@ -1,11 +1,15 @@ 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 af10f62ab9..9e5674cdea 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -2,15 +2,40 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 + + + + com.google.guava @@ -84,6 +109,7 @@ org.opendaylight.controller sal-dom-config + ${project.version} @@ -168,6 +194,13 @@ org.opendaylight.yangtools yang-maven-plugin + + + org.opendaylight.controller + yang-jmx-generator-plugin + 0.6.0-SNAPSHOT + + config @@ -183,10 +216,6 @@ 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 760db830ac..f0c124ff78 100644 --- a/opendaylight/md-sal/sal-karaf-xsql/pom.xml +++ b/opendaylight/md-sal/sal-karaf-xsql/pom.xml @@ -21,12 +21,14 @@ 4.0.0 - sal-parent - org.opendaylight.controller - 1.5.0-SNAPSHOT - + org.opendaylight.odlparent + odlparent + 1.8.0-SNAPSHOT + + org.opendaylight.controller + 1.5.0-SNAPSHOT sal-karaf-xsql bundle Apache Karaf :: Shell odl/xsql Commands @@ -37,27 +39,23 @@ 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 @@ -69,19 +67,9 @@ - - 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 de54c31691..80d269058f 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml @@ -3,9 +3,13 @@ 4.0.0 org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + config-parent + 0.6.0-SNAPSHOT + ../../config/config-parent + + org.opendaylight.controller + 1.5.0-SNAPSHOT sal-remoterpc-connector bundle @@ -225,39 +229,30 @@ - - 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 - - - - - - - + + + + + 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-schema-service/pom.xml b/opendaylight/md-sal/sal-schema-service/pom.xml index d7ccb5d927..34cb65a899 100644 --- a/opendaylight/md-sal/sal-schema-service/pom.xml +++ b/opendaylight/md-sal/sal-schema-service/pom.xml @@ -2,13 +2,29 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 2c7fce7237..140054798d 100644 --- a/opendaylight/md-sal/sal-test-model/pom.xml +++ b/opendaylight/md-sal/sal-test-model/pom.xml @@ -2,13 +2,17 @@ + 4.0.0 + - sal-parent - org.opendaylight.controller - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.0-SNAPSHOT + - 4.0.0 + org.opendaylight.controller + 1.5.0-SNAPSHOT sal-test-model bundle @@ -23,56 +27,6 @@ - - - - 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 fe1ffe87cf..afcabaa010 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml @@ -6,45 +6,50 @@ 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 - clustering-it - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.8.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 55fa13c0a7..f60f4c5832 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml @@ -1,15 +1,54 @@ - + 4.0.0 - clustering-it - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.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 + + + @@ -24,93 +63,6 @@ - - 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 e5a530c1d8..5370c337f7 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml @@ -2,10 +2,13 @@ 4.0.0 - org.opendaylight.controller.samples - sal-samples - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + odlparent-lite + 1.8.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 caa2b1a41a..d11a5cf056 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/pom.xml @@ -2,24 +2,17 @@ 4.0.0 - clustering-it - org.opendaylight.controller.samples - 1.5.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.6.0-SNAPSHOT + ../../../../config/config-parent - + + 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 50f25be693..74c4306a3e 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -2,12 +2,13 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.5.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.8.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 e057835754..30cef8f27b 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -2,22 +2,33 @@ 4.0.0 - org.opendaylight.controller.samples - sal-samples - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.0-SNAPSHOT + + + org.opendaylight.controller.samples + 1.5.0-SNAPSHOT sample-toaster-consumer bundle - - 1.5.0-SNAPSHOT - + + + + org.opendaylight.controller + mdsal-artifacts + 1.5.0-SNAPSHOT + pom + import + + + ${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 de81d9f789..67a2c00714 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.samples - sal-samples - 1.5.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.6.0-SNAPSHOT + ../../../config/config-parent + + org.opendaylight.controller.samples + 1.5.0-SNAPSHOT sample-toaster-provider bundle - - 1.5.0-SNAPSHOT - - ${project.groupId} @@ -66,35 +66,6 @@ - - - - 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 a00cb117fe..a77be4fb55 100644 --- a/opendaylight/md-sal/samples/toaster/pom.xml +++ b/opendaylight/md-sal/samples/toaster/pom.xml @@ -3,12 +3,14 @@ 4.0.0 - org.opendaylight.controller.samples - sal-samples - 1.5.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.10.0-SNAPSHOT + - + org.opendaylight.controller.samples + 1.5.0-SNAPSHOT sample-toaster bundle @@ -22,38 +24,4 @@ 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 - - - - - -