From 184594736e9dce133b9c0cd691494028f7414008 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Fri, 23 Feb 2018 09:56:32 -0500 Subject: [PATCH] Add restconf binding parent pom Contains the common stuff including checkstyle and findbugs. Change-Id: I4629e897991c9ee3bf763208392cc54c56ccb0a5 Signed-off-by: Tom Pantelis --- restconf/pom.xml | 1 + restconf/restconf-binding-parent/pom.xml | 75 +++++++++++++++++++ restconf/restconf-common-models/pom.xml | 8 +- restconf/restconf-common/pom.xml | 20 +---- .../ietf-restconf-monitoring/pom.xml | 8 +- .../restconf-models/ietf-restconf/pom.xml | 8 +- .../restconf-models/ietf-yang-library/pom.xml | 8 +- restconf/restconf-nb-bierman02/pom.xml | 64 +--------------- restconf/restconf-nb-rfc8040/pom.xml | 63 +--------------- restconf/sal-rest-docgen-maven/pom.xml | 35 +-------- restconf/sal-rest-docgen/pom.xml | 34 +-------- restconf/sal-restconf-broker/pom.xml | 20 +---- 12 files changed, 116 insertions(+), 228 deletions(-) create mode 100644 restconf/restconf-binding-parent/pom.xml diff --git a/restconf/pom.xml b/restconf/pom.xml index 39cf0f4cdd..1c59a4b0a9 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -23,6 +23,7 @@ ${project.artifactId} + restconf-binding-parent restconf-artifacts restconf-models restconf-common-models diff --git a/restconf/restconf-binding-parent/pom.xml b/restconf/restconf-binding-parent/pom.xml new file mode 100644 index 0000000000..6aac2185ff --- /dev/null +++ b/restconf/restconf-binding-parent/pom.xml @@ -0,0 +1,75 @@ + + + + 4.0.0 + + org.opendaylight.mdsal + binding-parent + 0.13.0-SNAPSHOT + + + + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + pom + + + + + org.opendaylight.aaa + aaa-artifacts + 0.8.0-SNAPSHOT + pom + import + + + org.opendaylight.controller + mdsal-artifacts + 1.8.0-SNAPSHOT + pom + import + + + org.opendaylight.netconf + restconf-artifacts + ${project.version} + pom + import + + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-grizzly2 + 2.6 + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + com.sun.jersey + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + + + + diff --git a/restconf/restconf-common-models/pom.xml b/restconf/restconf-common-models/pom.xml index a5b1317ebc..1a43e38152 100644 --- a/restconf/restconf-common-models/pom.xml +++ b/restconf/restconf-common-models/pom.xml @@ -12,10 +12,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../restconf-binding-parent org.opendaylight.netconf diff --git a/restconf/restconf-common/pom.xml b/restconf/restconf-common/pom.xml index 80a6c25a9a..bed5e5fb72 100644 --- a/restconf/restconf-common/pom.xml +++ b/restconf/restconf-common/pom.xml @@ -12,10 +12,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../restconf-binding-parent org.opendaylight.netconf @@ -24,18 +24,6 @@ bundle ${project.artifactId} - - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.opendaylight.yangtools diff --git a/restconf/restconf-models/ietf-restconf-monitoring/pom.xml b/restconf/restconf-models/ietf-restconf-monitoring/pom.xml index 346a8d68b0..eb7849d803 100644 --- a/restconf/restconf-models/ietf-restconf-monitoring/pom.xml +++ b/restconf/restconf-models/ietf-restconf-monitoring/pom.xml @@ -11,10 +11,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../../restconf-binding-parent org.opendaylight.netconf diff --git a/restconf/restconf-models/ietf-restconf/pom.xml b/restconf/restconf-models/ietf-restconf/pom.xml index efd6d000e7..d4bcdb4e80 100644 --- a/restconf/restconf-models/ietf-restconf/pom.xml +++ b/restconf/restconf-models/ietf-restconf/pom.xml @@ -11,10 +11,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../../restconf-binding-parent org.opendaylight.netconf diff --git a/restconf/restconf-models/ietf-yang-library/pom.xml b/restconf/restconf-models/ietf-yang-library/pom.xml index a889792f37..a50ed299a2 100644 --- a/restconf/restconf-models/ietf-yang-library/pom.xml +++ b/restconf/restconf-models/ietf-yang-library/pom.xml @@ -11,10 +11,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../../restconf-binding-parent org.opendaylight.netconf diff --git a/restconf/restconf-nb-bierman02/pom.xml b/restconf/restconf-nb-bierman02/pom.xml index c20f22c10c..4a90ef4b77 100644 --- a/restconf/restconf-nb-bierman02/pom.xml +++ b/restconf/restconf-nb-bierman02/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../restconf-binding-parent org.opendaylight.netconf @@ -20,45 +20,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.netconf - netconf-parent - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.aaa - aaa-artifacts - 0.8.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.9.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - 2.6 - - - - org.opendaylight.netconf @@ -237,16 +198,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - com.sun.jersey - - - org.apache.felix maven-bundle-plugin @@ -275,13 +226,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml index 72e137286f..a5b2060633 100644 --- a/restconf/restconf-nb-rfc8040/pom.xml +++ b/restconf/restconf-nb-rfc8040/pom.xml @@ -11,10 +11,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.13.0-SNAPSHOT - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../restconf-binding-parent org.opendaylight.netconf @@ -22,44 +22,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.netconf - netconf-parent - 1.5.0-SNAPSHOT - pom - import - - - org.opendaylight.aaa - aaa-artifacts - 0.8.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - config-artifacts - 0.9.0-SNAPSHOT - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - 2.6 - - - - org.opendaylight.netconf @@ -185,16 +147,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - com.sun.jersey - - - org.apache.felix maven-bundle-plugin @@ -217,13 +169,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - diff --git a/restconf/sal-rest-docgen-maven/pom.xml b/restconf/sal-rest-docgen-maven/pom.xml index e47dab7bea..f6b388131c 100644 --- a/restconf/sal-rest-docgen-maven/pom.xml +++ b/restconf/sal-rest-docgen-maven/pom.xml @@ -10,10 +10,10 @@ 4.0.0 - org.opendaylight.odlparent - odlparent - 3.0.2 - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../restconf-binding-parent org.opendaylight.netconf @@ -23,21 +23,6 @@ - - org.opendaylight.netconf - restconf-artifacts - ${project.version} - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - org.apache.maven maven-core @@ -65,16 +50,4 @@ sal-rest-docgen - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - - - diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml index 7c4ddbefbb..af26bbfd35 100644 --- a/restconf/sal-rest-docgen/pom.xml +++ b/restconf/sal-rest-docgen/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - org.opendaylight.odlparent - bundle-parent - 3.0.2 - + org.opendaylight.netconf + restconf-binding-parent + 1.8.0-SNAPSHOT + ../restconf-binding-parent org.opendaylight.netconf @@ -20,25 +20,6 @@ 1.8.0-SNAPSHOT bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.0.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.8.0-SNAPSHOT - pom - import - - - - com.github.mifmif @@ -155,13 +136,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - diff --git a/restconf/sal-restconf-broker/pom.xml b/restconf/sal-restconf-broker/pom.xml index fdb5d31cfd..ec985b025b 100644 --- a/restconf/sal-restconf-broker/pom.xml +++ b/restconf/sal-restconf-broker/pom.xml @@ -3,9 +3,11 @@ 4.0.0 org.opendaylight.netconf - restconf-parent + restconf-binding-parent 1.8.0-SNAPSHOT + ../restconf-binding-parent + sal-restconf-broker bundle @@ -42,21 +44,7 @@ slf4j-api - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - * - - - - - + scm:git:http://git.opendaylight.org/gerrit/controller.git scm:git:ssh://git.opendaylight.org:29418/controller.git -- 2.36.6