From: Tomas Cere Date: Mon, 22 Feb 2016 13:23:45 +0000 (+0000) Subject: Merge "Added initial design documentation for clustering." X-Git-Tag: release/boron~190 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6958fb8829f9e52c62c2b39526ae6a0e992da973;hp=96df47d9e457d97715593d77f406232513488d07;p=netconf.git Merge "Added initial design documentation for clustering." --- diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index ba2c186ea8..9190706595 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -31,7 +31,6 @@ 1.1.0-SNAPSHOT 1.4.0-SNAPSHOT 1.0.0-SNAPSHOT - 2.15 features.xml etc/opendaylight/karaf @@ -107,10 +106,6 @@ ${project.groupId} netconf-config-dispatcher - - ${project.groupId} - netconf-connector-config - ${project.groupId} abstract-topology @@ -155,17 +150,8 @@ xml config - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${commons.opendaylight.version} - test - zip - - + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index feeffc8412..c8dbc730d4 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -7,7 +7,7 @@ 1.7.0-SNAPSHOT - + org.opendaylight.netconf features-netconf 1.1.0-SNAPSHOT @@ -18,7 +18,6 @@ 1.7.0-SNAPSHOT 1.4.0-SNAPSHOT 0.5.0-SNAPSHOT - 0000.0002.0053.0 1.7.0-SNAPSHOT 0.9.0-SNAPSHOT 1.1.0-SNAPSHOT @@ -26,7 +25,6 @@ 1.0.0-SNAPSHOT 0.14.0 - features.xml etc/opendaylight/karaf 01-netconf.xml 08-mdsal-netconf.xml @@ -139,10 +137,6 @@ ${project.groupId} netconf-api - - ${project.groupId} - netconf-config - ${project.groupId} netconf-auth @@ -207,16 +201,6 @@ ${project.groupId} netconf-netty-util - - org.apache.sshd - sshd-core - ${sshd-core.version} - - - openexi - nagasena - ${exi.nagasena.version} - org.bouncycastle bcpkix-jdk15on @@ -232,14 +216,12 @@ ${project.groupId} netconf-config - ${netconf.version} xml config ${project.groupId} netconf-connector-config - ${netconf.version} xml config diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index d3b538c11a..72b7ff4ebe 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/pom.xml @@ -27,7 +27,6 @@ 2.1.0-SNAPSHOT 0.9.0-SNAPSHOT 1.4.0-SNAPSHOT - 2.15 1.0.0-SNAPSHOT features.xml diff --git a/opendaylight/netconf/aaa-authn-odl-plugin/pom.xml b/opendaylight/netconf/aaa-authn-odl-plugin/pom.xml index d0664190ec..abdf3c6123 100644 --- a/opendaylight/netconf/aaa-authn-odl-plugin/pom.xml +++ b/opendaylight/netconf/aaa-authn-odl-plugin/pom.xml @@ -11,14 +11,29 @@ 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.netconf - netconf-subsystem - 1.1.0-SNAPSHOT - .. + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + org.opendaylight.netconf aaa-authn-odl-plugin + 1.1.0-SNAPSHOT bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + + org.opendaylight.aaa @@ -37,12 +52,8 @@ org.osgi.core provided + - - junit - junit - test - org.slf4j slf4j-simple @@ -54,17 +65,4 @@ test - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - diff --git a/opendaylight/netconf/abstract-topology/pom.xml b/opendaylight/netconf/abstract-topology/pom.xml index 4f8f1e06a5..827e4de1b7 100644 --- a/opendaylight/netconf/abstract-topology/pom.xml +++ b/opendaylight/netconf/abstract-topology/pom.xml @@ -2,16 +2,39 @@ + 4.0.0 + - netconf-subsystem - org.opendaylight.netconf - 1.1.0-SNAPSHOT - ../ + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + - 4.0.0 + org.opendaylight.netconf abstract-topology + 1.1.0-SNAPSHOT bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + + + + + 2.3.14 + 2.11 + 7 + + org.opendaylight.mdsal.model @@ -65,7 +88,6 @@ org.mockito mockito-all - 1.9.5 test @@ -75,74 +97,4 @@ test - - - - - org.apache.felix - maven-bundle-plugin - - - * - - - - - - 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.opendaylight.controller - yang-jmx-generator-plugin - ${config.version} - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/config; - - - - - - - - - \ No newline at end of file + diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml index 10c8fe5ac4..a8058468ee 100644 --- a/opendaylight/netconf/config-netconf-connector/pom.xml +++ b/opendaylight/netconf/config-netconf-connector/pom.xml @@ -3,14 +3,29 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT - .. + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf config-netconf-connector - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -54,10 +69,6 @@ com.google.guava guava - - org.opendaylight.controller - commons.logback_settings - org.opendaylight.yangtools mockito-configuration diff --git a/opendaylight/netconf/mdsal-netconf-connector/pom.xml b/opendaylight/netconf/mdsal-netconf-connector/pom.xml index 8cb96b12a2..ff73077b62 100644 --- a/opendaylight/netconf/mdsal-netconf-connector/pom.xml +++ b/opendaylight/netconf/mdsal-netconf-connector/pom.xml @@ -3,15 +3,48 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf mdsal-netconf-connector - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + + + org.opendaylight.yangtools + yang-data-impl + + + + + org.opendaylight.yangtools + object-cache-api + + + + + org.opendaylight.yangtools + object-cache-noop + + ${project.groupId} netconf-api @@ -32,22 +65,8 @@ com.google.guava guava - - org.opendaylight.yangtools - yang-data-impl - - - org.opendaylight.yangtools - object-cache-api - - - - - org.opendaylight.yangtools - object-cache-noop - - + org.opendaylight.controller sal-core-api @@ -55,10 +74,6 @@ org.opendaylight.controller sal-dom-config - - org.opendaylight.controller - commons.logback_settings - org.opendaylight.yangtools mockito-configuration @@ -101,23 +116,4 @@ test - - - - - org.apache.felix - maven-bundle-plugin - - - * - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml b/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml index 54326f64f8..2a1e850cfb 100644 --- a/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml +++ b/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml @@ -2,13 +2,29 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf mdsal-netconf-monitoring - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -28,10 +44,10 @@ ${project.groupId} netconf-util - - org.opendaylight.controller - sal-binding-config - + + org.opendaylight.controller + sal-binding-config + com.google.guava @@ -52,17 +68,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/netconf/mdsal-netconf-notification/pom.xml b/opendaylight/netconf/mdsal-netconf-notification/pom.xml index bfaecb7abd..9050e83b25 100644 --- a/opendaylight/netconf/mdsal-netconf-notification/pom.xml +++ b/opendaylight/netconf/mdsal-netconf-notification/pom.xml @@ -2,13 +2,29 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf mdsal-netconf-notification - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -46,25 +62,4 @@ mockito-configuration - - - - - - - org.apache.felix - maven-bundle-plugin - - - * - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - - \ No newline at end of file + diff --git a/opendaylight/netconf/messagebus-netconf/pom.xml b/opendaylight/netconf/messagebus-netconf/pom.xml index ea175cfa43..7559fdd5d4 100644 --- a/opendaylight/netconf/messagebus-netconf/pom.xml +++ b/opendaylight/netconf/messagebus-netconf/pom.xml @@ -12,16 +12,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + org.opendaylight.netconf messagebus-netconf + 1.1.0-SNAPSHOT ${project.artifactId} - bundle + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + + ${project.groupId} @@ -70,27 +84,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - junit - junit + org.mockito + mockito-core test - org.mockito - mockito-all - test + org.hamcrest + hamcrest-core - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - org.codehaus.mojo build-helper-maven-plugin diff --git a/opendaylight/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/opendaylight/netconf/models/ietf-netconf-monitoring-extension/pom.xml index 6e5c3c4402..2735087e8f 100644 --- a/opendaylight/netconf/models/ietf-netconf-monitoring-extension/pom.xml +++ b/opendaylight/netconf/models/ietf-netconf-monitoring-extension/pom.xml @@ -1,14 +1,31 @@ 4.0.0 + - org.opendaylight.netconf - netconf-models - 1.1.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.9.0-SNAPSHOT + + + org.opendaylight.netconf ietf-netconf-monitoring-extension - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -24,23 +41,4 @@ slf4j-api - - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210, - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - diff --git a/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml index f5417c9690..e2d52a97ba 100644 --- a/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml +++ b/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml @@ -1,17 +1,21 @@ 4.0.0 + - org.opendaylight.netconf - netconf-models - 1.1.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.9.0-SNAPSHOT + + + org.opendaylight.netconf ietf-netconf-monitoring - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle - com.google.guava guava @@ -29,24 +33,4 @@ slf4j-api - - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.* - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml b/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml index b5a9ffb47c..f424b8b79a 100644 --- a/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml +++ b/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml @@ -9,14 +9,31 @@ 4.0.0 + - org.opendaylight.netconf - netconf-models - 1.1.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.9.0-SNAPSHOT + + + org.opendaylight.netconf ietf-netconf-notifications - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -36,28 +53,4 @@ slf4j-api - - - - - - org.apache.felix - maven-bundle-plugin - - - - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.*, - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.*, - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.* - - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/netconf/models/ietf-netconf/pom.xml b/opendaylight/netconf/models/ietf-netconf/pom.xml index fc6d3475da..dd47527f46 100644 --- a/opendaylight/netconf/models/ietf-netconf/pom.xml +++ b/opendaylight/netconf/models/ietf-netconf/pom.xml @@ -9,17 +9,21 @@ 4.0.0 + - org.opendaylight.netconf - netconf-models - 1.1.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.9.0-SNAPSHOT + + + org.opendaylight.netconf ietf-netconf + 1.1.0-SNAPSHOT bundle ${project.artifactId} - com.google.guava guava @@ -33,24 +37,4 @@ slf4j-api - - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.* - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/netconf/models/pom.xml b/opendaylight/netconf/models/pom.xml index c8bdb777b4..a25a78a9b5 100644 --- a/opendaylight/netconf/models/pom.xml +++ b/opendaylight/netconf/models/pom.xml @@ -7,9 +7,8 @@ netconf-subsystem 1.1.0-SNAPSHOT - netconf-models - 1.1.0-SNAPSHOT + netconf-models pom ${project.artifactId} @@ -19,60 +18,4 @@ ietf-netconf-notifications ietf-netconf-monitoring-extension - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - false - true - checkstyle-logging.xml - true - true - ${project.basedir} - **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang - **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/netconf\/test\/tool\/Main.java, **\/netconf\/test\/tool\/client\/stress\/StressClient.java - - - - org.opendaylight.yangtools - checkstyle-logging - ${yangtools.version} - - - - - - check - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml index a3791a42e4..d105ba39da 100644 --- a/opendaylight/netconf/netconf-api/pom.xml +++ b/opendaylight/netconf/netconf-api/pom.xml @@ -3,13 +3,29 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf netconf-api - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -43,21 +59,6 @@ org.opendaylight.yangtools mockito-configuration - test - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - - diff --git a/opendaylight/netconf/netconf-artifacts/pom.xml b/opendaylight/netconf/netconf-artifacts/pom.xml index c5839172ad..f8dcad625b 100644 --- a/opendaylight/netconf/netconf-artifacts/pom.xml +++ b/opendaylight/netconf/netconf-artifacts/pom.xml @@ -78,11 +78,15 @@ ${project.groupId} netconf-config ${project.version} + xml + config ${project.groupId} netconf-connector-config ${project.version} + xml + config ${project.groupId} diff --git a/opendaylight/netconf/netconf-auth/pom.xml b/opendaylight/netconf/netconf-auth/pom.xml index 76f50bd63c..28cac1da27 100644 --- a/opendaylight/netconf/netconf-auth/pom.xml +++ b/opendaylight/netconf/netconf-auth/pom.xml @@ -10,64 +10,15 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT - ../ + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf netconf-auth - bundle + 1.1.0-SNAPSHOT ${project.artifactId} - - - - org.opendaylight.controller - config-api - - - - - - - org.apache.felix - maven-bundle-plugin - - - 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.opendaylight.controller - yang-jmx-generator-plugin - ${config.version} - - - - - - + bundle diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml index dbc0797e8b..fa9bccd53f 100644 --- a/opendaylight/netconf/netconf-client/pom.xml +++ b/opendaylight/netconf/netconf-client/pom.xml @@ -3,13 +3,29 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf netconf-client - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -24,12 +40,12 @@ ${project.groupId} netconf-util - - ${project.groupId} - netconf-util - test-jar - test - + + ${project.groupId} + netconf-util + test-jar + test + com.google.guava guava @@ -42,23 +58,14 @@ org.slf4j slf4j-api - - org.opendaylight.yangtools - mockito-configuration - + + org.opendaylight.yangtools + mockito-configuration + - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.netconf.client.*, - - - org.apache.maven.plugins maven-jar-plugin diff --git a/opendaylight/netconf/netconf-config-dispatcher/pom.xml b/opendaylight/netconf/netconf-config-dispatcher/pom.xml index d5e5483813..66711a5ac1 100644 --- a/opendaylight/netconf/netconf-config-dispatcher/pom.xml +++ b/opendaylight/netconf/netconf-config-dispatcher/pom.xml @@ -8,24 +8,39 @@ --> 4.0.0 - - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT - + + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf netconf-config-dispatcher + 1.1.0-SNAPSHOT bundle + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + + - - org.opendaylight.controller - config-api - - - ${project.groupId} - netconf-client - + + org.opendaylight.controller + config-api + + + ${project.groupId} + netconf-client + org.opendaylight.controller @@ -59,17 +74,4 @@ test - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - diff --git a/opendaylight/netconf/netconf-config/pom.xml b/opendaylight/netconf/netconf-config/pom.xml index 51e0ab63bd..fc700930cf 100644 --- a/opendaylight/netconf/netconf-config/pom.xml +++ b/opendaylight/netconf/netconf-config/pom.xml @@ -10,13 +10,18 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf netconf-config + 1.1.0-SNAPSHOT Configuration files for netconf jar + diff --git a/opendaylight/netconf/netconf-connector-config/pom.xml b/opendaylight/netconf/netconf-connector-config/pom.xml index 6b3877c23e..c2d6f3140a 100644 --- a/opendaylight/netconf/netconf-connector-config/pom.xml +++ b/opendaylight/netconf/netconf-connector-config/pom.xml @@ -10,13 +10,17 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + odlparent-lite + 1.7.0-SNAPSHOT + + netconf-connector-config Configuration files for netconf-connector + 1.1.0-SNAPSHOT jar + diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml index 6eb0dfba66..a98c76cb86 100644 --- a/opendaylight/netconf/netconf-impl/pom.xml +++ b/opendaylight/netconf/netconf-impl/pom.xml @@ -3,13 +3,29 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf netconf-impl - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -49,10 +65,6 @@ com.google.guava guava - - org.opendaylight.controller - commons.logback_settings - org.opendaylight.controller config-util @@ -125,10 +137,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml index af67990b98..968fa61596 100644 --- a/opendaylight/netconf/netconf-it/pom.xml +++ b/opendaylight/netconf/netconf-it/pom.xml @@ -10,6 +10,7 @@ netconf-it ${project.artifactId} + jar diff --git a/opendaylight/netconf/netconf-mapping-api/pom.xml b/opendaylight/netconf/netconf-mapping-api/pom.xml index a64d7a6aff..029605197c 100644 --- a/opendaylight/netconf/netconf-mapping-api/pom.xml +++ b/opendaylight/netconf/netconf-mapping-api/pom.xml @@ -3,41 +3,42 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + - netconf-mapping-api - bundle + org.opendaylight.netconf + netconf-mapping-api + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + ${project.groupId} netconf-api - - org.opendaylight.controller - config-manager-facade-xml - - + + org.opendaylight.controller + config-manager-facade-xml + com.google.guava guava - - - - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - diff --git a/opendaylight/netconf/netconf-mdsal-config/pom.xml b/opendaylight/netconf/netconf-mdsal-config/pom.xml index 12ec4db740..6f1af5afaf 100644 --- a/opendaylight/netconf/netconf-mdsal-config/pom.xml +++ b/opendaylight/netconf/netconf-mdsal-config/pom.xml @@ -10,13 +10,18 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + odlparent-lite + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf netconf-mdsal-config + 1.1.0-SNAPSHOT Configuration files for netconf for mdsal jar + diff --git a/opendaylight/netconf/netconf-monitoring/pom.xml b/opendaylight/netconf/netconf-monitoring/pom.xml index e9926481b8..5a9ba0a5ec 100644 --- a/opendaylight/netconf/netconf-monitoring/pom.xml +++ b/opendaylight/netconf/netconf-monitoring/pom.xml @@ -1,14 +1,31 @@ 4.0.0 + - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf netconf-monitoring - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + diff --git a/opendaylight/netconf/netconf-netty-util/pom.xml b/opendaylight/netconf/netconf-netty-util/pom.xml index 8aaab0a840..4ac2772ca3 100644 --- a/opendaylight/netconf/netconf-netty-util/pom.xml +++ b/opendaylight/netconf/netconf-netty-util/pom.xml @@ -10,14 +10,49 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf netconf-netty-util bundle + 1.1.0-SNAPSHOT ${project.artifactId} + + + + org.opendaylight.netconf + netconf-parent + ${project.version} + pom + import + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + + openexi + nagasena + 0000.0002.0053.0 + + + openexi + nagasena-rta + 0000.0002.0053.0 + + + + @@ -51,6 +86,7 @@ org.apache.sshd sshd-core + 0.14.0 openexi @@ -76,15 +112,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.netconf.nettyutil.* - - - org.apache.maven.plugins maven-jar-plugin diff --git a/opendaylight/netconf/netconf-notifications-api/pom.xml b/opendaylight/netconf/netconf-notifications-api/pom.xml index 6240f4d6c9..f93d720abd 100644 --- a/opendaylight/netconf/netconf-notifications-api/pom.xml +++ b/opendaylight/netconf/netconf-notifications-api/pom.xml @@ -10,14 +10,31 @@ + 4.0.0 + - netconf-subsystem - org.opendaylight.netconf - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + - 4.0.0 - bundle + + org.opendaylight.netconf netconf-notifications-api + 1.1.0-SNAPSHOT + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -37,17 +54,4 @@ slf4j-api - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - org.apache.felix - maven-bundle-plugin - - - - \ No newline at end of file + diff --git a/opendaylight/netconf/netconf-notifications-impl/pom.xml b/opendaylight/netconf/netconf-notifications-impl/pom.xml index 136525959d..ecaadf6332 100644 --- a/opendaylight/netconf/netconf-notifications-impl/pom.xml +++ b/opendaylight/netconf/netconf-notifications-impl/pom.xml @@ -12,12 +12,28 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - netconf-subsystem - org.opendaylight.netconf - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + - bundle + + org.opendaylight.netconf netconf-notifications-impl + 1.1.0-SNAPSHOT + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -74,10 +90,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/opendaylight/netconf/netconf-ssh/pom.xml b/opendaylight/netconf/netconf-ssh/pom.xml index 4ec1a1f0be..54f2ca1921 100644 --- a/opendaylight/netconf/netconf-ssh/pom.xml +++ b/opendaylight/netconf/netconf-ssh/pom.xml @@ -2,13 +2,29 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf netconf-ssh - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -27,16 +43,16 @@ ${project.groupId} netconf-impl - - org.opendaylight.controller - threadpool-config-api - - - org.opendaylight.controller - netty-config-api - + + org.opendaylight.controller + threadpool-config-api + + + org.opendaylight.controller + netty-config-api + - + org.opendaylight.mdsal.model ietf-inet-types @@ -49,13 +65,9 @@ bcprov-jdk15on - org.apache.sshd - sshd-core + com.google.guava + guava - - com.google.guava - guava - org.slf4j slf4j-api diff --git a/opendaylight/netconf/netconf-tcp/pom.xml b/opendaylight/netconf/netconf-tcp/pom.xml index 2c9fcfa9cd..8a743d9921 100644 --- a/opendaylight/netconf/netconf-tcp/pom.xml +++ b/opendaylight/netconf/netconf-tcp/pom.xml @@ -8,15 +8,31 @@ --> 4.0.0 + - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT - ../ + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf netconf-tcp - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -27,14 +43,14 @@ ${project.groupId} netconf-util - - org.opendaylight.controller - threadpool-config-api - - - org.opendaylight.controller - netty-config-api - + + org.opendaylight.controller + threadpool-config-api + + + org.opendaylight.controller + netty-config-api + org.slf4j slf4j-api @@ -57,10 +73,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/opendaylight/netconf/netconf-topology-config/pom.xml b/opendaylight/netconf/netconf-topology-config/pom.xml index 8155b66da9..ab5a2f8cc7 100644 --- a/opendaylight/netconf/netconf-topology-config/pom.xml +++ b/opendaylight/netconf/netconf-topology-config/pom.xml @@ -2,17 +2,21 @@ + 4.0.0 + - netconf-subsystem - org.opendaylight.netconf - 1.1.0-SNAPSHOT - ../ + org.opendaylight.odlparent + odlparent-lite + 1.7.0-SNAPSHOT + - 4.0.0 + org.opendaylight.netconf netconf-topology-config + 1.1.0-SNAPSHOT Configuration files for netconf topology jar + @@ -45,4 +49,4 @@ - \ No newline at end of file + diff --git a/opendaylight/netconf/netconf-topology/pom.xml b/opendaylight/netconf/netconf-topology/pom.xml index 7bf1a57295..41184f7d09 100644 --- a/opendaylight/netconf/netconf-topology/pom.xml +++ b/opendaylight/netconf/netconf-topology/pom.xml @@ -2,16 +2,31 @@ + 4.0.0 - netconf-subsystem - org.opendaylight.netconf - 1.1.0-SNAPSHOT - ../ + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + - 4.0.0 + org.opendaylight.netconf netconf-topology + 1.1.0-SNAPSHOT bundle + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + + org.opendaylight.controller @@ -61,31 +76,6 @@ org.opendaylight.netconf abstract-topology - - org.scala-lang - scala-library - ${scala.major.version}.${scala.minor.version} - - - com.typesafe.akka - akka-actor_${scala.major.version} - ${akka.version} - - - com.typesafe.akka - akka-remote_${scala.major.version} - ${akka.version} - - - com.typesafe.akka - akka-cluster_${scala.major.version} - ${akka.version} - - - com.typesafe.akka - akka-osgi_${scala.major.version} - ${akka.version} - com.typesafe config @@ -110,51 +100,6 @@ - - org.apache.felix - maven-bundle-plugin - - - * - - - - - - 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.opendaylight.controller - yang-jmx-generator-plugin - ${config.version} - - - org.codehaus.mojo build-helper-maven-plugin @@ -177,4 +122,4 @@ - \ No newline at end of file + diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml index 4a991c7c35..154dedf380 100644 --- a/opendaylight/netconf/netconf-util/pom.xml +++ b/opendaylight/netconf/netconf-util/pom.xml @@ -3,13 +3,36 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf netconf-util - bundle + 1.1.0-SNAPSHOT ${project.artifactId} + bundle + + + + + org.opendaylight.netconf + netconf-parent + ${project.version} + pom + import + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -50,10 +73,10 @@ org.opendaylight.yangtools mockito-configuration - + org.opendaylight.yangtools yang-model-api - + org.opendaylight.yangtools yang-data-api @@ -62,15 +85,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.opendaylight.netconf.util.* - - - org.apache.maven.plugins maven-jar-plugin diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml index ee3e4f23a7..1d95c7f182 100644 --- a/opendaylight/netconf/pom.xml +++ b/opendaylight/netconf/pom.xml @@ -3,13 +3,15 @@ 4.0.0 - org.opendaylight.netconf - netconf-parent - 1.1.0-SNAPSHOT - ../.. + org.opendaylight.odlparent + odlparent-lite + 1.7.0-SNAPSHOT + + org.opendaylight.netconf netconf-subsystem + 1.1.0-SNAPSHOT pom ${project.artifactId} @@ -46,36 +48,20 @@ netconf-artifacts - - - org.osgi - org.osgi.core - - - ch.qos.logback - logback-classic - test - - - junit - junit - test - - - org.opendaylight.netconf - netconf-artifacts - ${netconf.version} + netconf-parent + ${project.version} pom import + - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} + org.opendaylight.netconf + netconf-artifacts + ${project.version} pom import @@ -83,75 +69,8 @@ org.opendaylight.controller protocol-framework - ${protocol-framework.version} - - - - org.opendaylight.controller - messagebus-api - ${controller.mdsal.version} - - - org.opendaylight.controller - messagebus-config - ${controller.mdsal.version} - - - org.opendaylight.controller - messagebus-impl - ${controller.mdsal.version} - - - org.opendaylight.controller - messagebus-spi - ${controller.mdsal.version} - - - org.opendaylight.controller - messagebus-util - ${controller.mdsal.version} + 0.8.0-SNAPSHOT - - - org.apache.sshd - sshd-core - ${sshd-core.version} - - - openexi - nagasena - ${exi.nagasena.version} - - - openexi - nagasena-rta - ${exi.nagasena.version} - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - - - - org.opendaylight.controller - yang-jmx-generator-plugin - ${config.version} - - - - org.opendaylight.controller - commons.logback_settings - ${commons.logback_settings.version} - test - - - org.opendaylight.odlparent - features-test - ${features.test.version} - test - - diff --git a/opendaylight/netconf/sal-netconf-connector/pom.xml b/opendaylight/netconf/sal-netconf-connector/pom.xml index 83de33d0fe..ee1640e33d 100644 --- a/opendaylight/netconf/sal-netconf-connector/pom.xml +++ b/opendaylight/netconf/sal-netconf-connector/pom.xml @@ -2,17 +2,30 @@ 4.0.0 - org.opendaylight.netconf - netconf-subsystem - 1.1.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + org.opendaylight.netconf sal-netconf-connector + + 1.4.0-SNAPSHOT bundle - - ${controller.mdsal.version} + + + + org.opendaylight.netconf + netconf-artifacts + 1.1.0-SNAPSHOT + pom + import + + + @@ -103,14 +116,14 @@ org.slf4j slf4j-api - - xmlunit - xmlunit - - + + xmlunit + xmlunit + + org.opendaylight.controller config-api - provided + provided org.opendaylight.controller @@ -164,15 +177,19 @@ test - org.opendaylight.controller - sal-binding-broker-impl - test-jar - test + org.opendaylight.controller + sal-binding-broker-impl + test-jar + test - org.mockito - mockito-core - test + org.mockito + mockito-core + test + + + org.hamcrest + hamcrest-core org.powermock @@ -188,68 +205,6 @@ - - - - org.apache.felix - maven-bundle-plugin - - - * - - - - - - 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.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - 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/netconf/tools/netconf-cli/pom.xml b/opendaylight/netconf/tools/netconf-cli/pom.xml index 912a6d6c97..7f8d238b8a 100644 --- a/opendaylight/netconf/tools/netconf-cli/pom.xml +++ b/opendaylight/netconf/tools/netconf-cli/pom.xml @@ -8,14 +8,30 @@ 4.0.0 - org.opendaylight.netconf - netconf-tools - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf netconf-cli + 1.1.0-SNAPSHOT jar ${project.artifactId} + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + + ch.qos.logback @@ -76,6 +92,10 @@ com.google.guava guava + + junit + junit + diff --git a/opendaylight/netconf/tools/netconf-testtool/pom.xml b/opendaylight/netconf/tools/netconf-testtool/pom.xml index 9b1b17f8dc..c3befad958 100644 --- a/opendaylight/netconf/tools/netconf-testtool/pom.xml +++ b/opendaylight/netconf/tools/netconf-testtool/pom.xml @@ -12,13 +12,29 @@ 4.0.0 - org.opendaylight.netconf - netconf-tools - 1.1.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.7.0-SNAPSHOT + + org.opendaylight.netconf netconf-testtool ${project.artifactId} + 1.1.0-SNAPSHOT + jar + + + + + org.opendaylight.netconf + netconf-subsystem + ${project.version} + pom + import + + + @@ -52,10 +68,6 @@ ${project.groupId} netconf-auth - - org.opendaylight.controller - commons.logback_settings - ${project.groupId} config-netconf-connector diff --git a/opendaylight/netconf/tools/pom.xml b/opendaylight/netconf/tools/pom.xml index d000880463..5f518e34c9 100644 --- a/opendaylight/netconf/tools/pom.xml +++ b/opendaylight/netconf/tools/pom.xml @@ -6,10 +6,9 @@ org.opendaylight.netconf netconf-subsystem 1.1.0-SNAPSHOT - ../ - netconf-tools + netconf-tools pom ${project.artifactId} @@ -21,89 +20,4 @@ netconf-cli netconf-testtool - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - - - - - - generate-sources - - - src/main/yang - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - ${project.build.directory}/site/models - - - true - - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - false - true - checkstyle-logging.xml - true - true - ${project.basedir} - **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang - **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/netconf\/test\/tool\/Main.java, **\/netconf\/test\/tool\/client\/stress\/StressClient.java - - - - org.opendaylight.yangtools - checkstyle-logging - ${yangtools.version} - - - - - - check - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - diff --git a/opendaylight/restconf/pom.xml b/opendaylight/restconf/pom.xml index be9436fb95..544dc58012 100644 --- a/opendaylight/restconf/pom.xml +++ b/opendaylight/restconf/pom.xml @@ -3,11 +3,13 @@ 4.0.0 - org.opendaylight.netconf - netconf-parent - 1.1.0-SNAPSHOT - ../.. + org.opendaylight.odlparent + odlparent-lite + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf restconf-parent 1.4.0-SNAPSHOT pom @@ -34,29 +36,6 @@ pom import - - org.apache.maven - maven-core - 3.1.1 - provided - - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - 2.4 - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - - - org.opendaylight.controller - yang-jmx-generator-plugin - ${config.version} - - diff --git a/opendaylight/restconf/sal-rest-connector-config/pom.xml b/opendaylight/restconf/sal-rest-connector-config/pom.xml index 88ac9d8017..dea016fe4f 100644 --- a/opendaylight/restconf/sal-rest-connector-config/pom.xml +++ b/opendaylight/restconf/sal-rest-connector-config/pom.xml @@ -7,15 +7,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - 4.0.0 + - org.opendaylight.netconf - restconf-parent - 1.4.0-SNAPSHOT + org.opendaylight.odlparent + odlparent-lite + 1.7.0-SNAPSHOT + + + org.opendaylight.netconf sal-rest-connector-config + 1.4.0-SNAPSHOT Configuration files for sal-rest-connector + jar diff --git a/opendaylight/restconf/sal-rest-connector/pom.xml b/opendaylight/restconf/sal-rest-connector/pom.xml index b6436d6b78..31b614766f 100644 --- a/opendaylight/restconf/sal-rest-connector/pom.xml +++ b/opendaylight/restconf/sal-rest-connector/pom.xml @@ -2,13 +2,34 @@ 4.0.0 - org.opendaylight.netconf - restconf-parent - 1.4.0-SNAPSHOT + org.opendaylight.controller + config-parent + 0.5.0-SNAPSHOT + + + org.opendaylight.netconf sal-rest-connector + 1.4.0-SNAPSHOT bundle + + + + org.opendaylight.netconf + netconf-parent + 1.1.0-SNAPSHOT + pom + import + + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-grizzly2 + 2.4 + + + + org.opendaylight.controller @@ -126,11 +147,6 @@ - - junit - junit - test - org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 @@ -138,9 +154,13 @@ org.mockito - mockito-all + mockito-core test + + org.hamcrest + hamcrest-core + @@ -183,34 +203,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 - - - - diff --git a/opendaylight/restconf/sal-rest-docgen-maven/pom.xml b/opendaylight/restconf/sal-rest-docgen-maven/pom.xml index 490022bba3..0387d0bfda 100644 --- a/opendaylight/restconf/sal-rest-docgen-maven/pom.xml +++ b/opendaylight/restconf/sal-rest-docgen-maven/pom.xml @@ -10,32 +10,60 @@ 4.0.0 - org.opendaylight.netconf - restconf-parent - 1.4.0-SNAPSHOT + org.opendaylight.odlparent + odlparent + 1.7.0-SNAPSHOT + + org.opendaylight.netconf sal-rest-docgen-maven + 1.4.0-SNAPSHOT jar + + + + org.opendaylight.netconf + restconf-artifacts + ${project.version} + pom + import + + + + org.opendaylight.netconf + netconf-parent + 1.1.0-SNAPSHOT + pom + import + + + + org.apache.maven + maven-core + 3.2.5 + provided + + + + com.fasterxml.jackson.core jackson-databind - - ${project.groupId} - sal-rest-docgen - ${project.version} - org.apache.maven maven-core - provided org.opendaylight.yangtools yang-maven-plugin-spi + + ${project.groupId} + sal-rest-docgen + diff --git a/opendaylight/restconf/sal-rest-docgen/pom.xml b/opendaylight/restconf/sal-rest-docgen/pom.xml index 6457dd28ff..e8dbf6defc 100644 --- a/opendaylight/restconf/sal-rest-docgen/pom.xml +++ b/opendaylight/restconf/sal-rest-docgen/pom.xml @@ -2,14 +2,29 @@ 4.0.0 - org.opendaylight.netconf - restconf-parent - 1.4.0-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 1.7.0-SNAPSHOT + + org.opendaylight.netconf sal-rest-docgen + 1.4.0-SNAPSHOT bundle + + + + org.opendaylight.netconf + netconf-parent + 1.1.0-SNAPSHOT + pom + import + + + + com.fasterxml.jackson.core @@ -76,11 +91,6 @@ org.slf4j slf4j-api - - junit - junit - test - org.mockito mockito-all diff --git a/pom.xml b/pom.xml index 7bea315dfd..91749a7fb1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,9 @@ org.opendaylight.odlparent - odlparent + odlparent-lite 1.7.0-SNAPSHOT + org.opendaylight.netconf @@ -23,34 +24,16 @@ - 0.4.0-SNAPSHOT - 2.3.14 - 0.3.0-SNAPSHOT - 1.7.0-SNAPSHOT 0.5.0-SNAPSHOT etc/opendaylight/karaf - 0000.0002.0053.0 1.7.0-SNAPSHOT - 2010.09.24.9-SNAPSHOT - 2013.10.19.9-SNAPSHOT - 2013.10.21.9-SNAPSHOT - 2010.09.24.9-SNAPSHOT 2.1.0-SNAPSHOT 0.9.0-SNAPSHOT 1.4.0-SNAPSHOT 1.1.0-SNAPSHOT 1.4.0-SNAPSHOT - 0.8.0-SNAPSHOT - 0.14.0 - 2.11 - 7 - 2.15 1.0.0-SNAPSHOT - - src/main/yang-gen-config - src/main/yang-gen-sal - @@ -80,7 +63,7 @@ org.opendaylight.aaa aaa-artifacts - ${aaa.version} + 0.4.0-SNAPSHOT pom import @@ -107,15 +90,6 @@ org.apache.maven.plugins maven-checkstyle-plugin - - true - controller/checkstyle.xml - true - true - ${project.basedir} - **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat - **\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/protobuff\/,**\/src\/main\/resources\/archetype-resources\/**\/*.java - org.opendaylight.controller @@ -123,110 +97,6 @@ 0.3.0-SNAPSHOT - - - - check - - process-sources - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - - - - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - 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.opendaylight.controller - yang-jmx-generator-plugin - ${config.version} - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - org.opendaylight.mdsal - yang-binding - ${mdsal.model.version} - jar - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/config; - - - - - - - maven-clean-plugin - - - - ${jmxGeneratorPath} - - ** - - - - ${salGeneratorPath} - - ** - - - -