From 5cfbc703cbf0183b76fb9d8157ffb860f429ec26 Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Tue, 20 Sep 2016 15:09:55 +0200 Subject: HONEYCOMB-202: Honeycomb-parent pom As a replacement for: odlparent-lite + odlparent + bundle-parent + binding-parent + config-parent Change-Id: I68054fe548a627a92978d5aa399f5d4aea6b9703 Signed-off-by: Maros Marsalek --- common/api-parent/pom.xml | 216 +++++------- common/honeycomb-parent/pom.xml | 387 +++++++++++++++++++++ common/impl-parent/pom.xml | 179 +--------- common/minimal-distribution-parent/pom.xml | 231 +----------- common/pom.xml | 1 + infra/it/it-test/pom.xml | 4 + infra/minimal-distribution/pom.xml | 20 -- infra/notification/api/pom.xml | 4 + .../notification/NotificationCollector.java | 1 + infra/translate-utils/pom.xml | 4 + 10 files changed, 503 insertions(+), 544 deletions(-) create mode 100644 common/honeycomb-parent/pom.xml diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml index 17466d0a8..6937fb6ee 100644 --- a/common/api-parent/pom.xml +++ b/common/api-parent/pom.xml @@ -14,155 +14,107 @@ limitations under the License. --> + - org.opendaylight.mdsal - binding-parent - 0.8.2-Beryllium-SR2 - + io.fd.honeycomb.common + honeycomb-parent + 1.16.12-SNAPSHOT + ../honeycomb-parent - - http://nexus.fd.io/content - - 4.0.0 - io.fd.honeycomb.common api-parent 1.16.12-SNAPSHOT pom - - - - maven-checkstyle-plugin - - - honeycomb-checkstyle.xml - true - - - - - - - check-license - - check - - process-sources - - HONEYCOMB_LICENSE.txt - true - true - ${project.build.directory}/checkstyle-license-result.xml - - - - - - check-logging - - check - - process-sources - - true - honeycomb-checkstyle-logging.xml - true - true - ${project.basedir} - **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang - **\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/,**\/src/main/yang\/ - ${project.build.directory}/checkstyle-logging-result.xml - - - - - check - - process-sources - - - - - io.fd.honeycomb.common - honeycomb-checkstyle - - 1.16.12-SNAPSHOT - - - - org.opendaylight.yangtools - checkstyle-logging - ${yangtools.version} - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - + - - maven-checkstyle-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - unpack-license - none - unpack - - - + - org.apache.maven.plugins - maven-compiler-plugin - - - javac-with-errorprone - true - true - 1.8 - 1.8 - + org.opendaylight.yangtools + yang-maven-plugin + ${yangtools.version} - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.5 - - - - com.google.errorprone - error_prone_core - 2.0.9 + org.opendaylight.mdsal + maven-sal-api-gen-plugin + 0.8.2-Beryllium-SR2 + jar + + + binding + + generate-sources + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + ${salGeneratorPath} + + + true + + + + + + maven-clean-plugin + + + + ${salGeneratorPath} + + ** + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-yang-sources + generate-sources + + add-source + + + + ${salGeneratorPath} + + + + + + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + - - - fdio-release - ${nexusproxy}/repositories/fd.io.release/ - - - fdio-snapshot - ${nexusproxy}/repositories/fd.io.snapshot/ - - + + + org.opendaylight.mdsal + yang-binding + + + org.opendaylight.yangtools + yang-common + + diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml new file mode 100644 index 000000000..4d6ca2fb0 --- /dev/null +++ b/common/honeycomb-parent/pom.xml @@ -0,0 +1,387 @@ + + + + 4.0.0 + io.fd.honeycomb.common + honeycomb-parent + 1.16.12-SNAPSHOT + pom + + + http://nexus.fd.io/content + https://nexus.opendaylight.org/content + + + 2.4 + jacoco + target/code-coverage/jacoco.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen** + + UTF-8 + UTF-8 + + + 0.8.2-Beryllium-SR2 + 2.0.2-Beryllium-SR2 + 1.3.2-Beryllium-SR2 + 0.8.2-Beryllium-SR2 + 1.0.2-Beryllium-SR2 + 1.3.2-Beryllium-SR2 + target/generated-sources/mdsal-binding + + + 4.11 + 1.9.5 + 1.3 + 18.0 + + + 2.16 + 2.10.3 + 0.7.2.201409121644 + 1.4 + 3.3 + 3.0.0 + + + APACHE_HEADER.txt + + + + fd.io + https://fd.io + + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + JIRA + https://jira.fd.io/ + + + + Jenkins + https://jenkins.fd.io/ + + + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${yangtools.version} + pom + import + + + org.opendaylight.controller + mdsal-artifacts + ${mdsal.controller.version} + pom + import + + + org.opendaylight.mdsal + mdsal-artifacts + ${mdsal.version} + pom + import + + + org.opendaylight.netconf + netconf-artifacts + ${netconf.version} + pom + import + + + org.opendaylight.netconf + restconf-artifacts + ${restconf.version} + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + ${mdsalmodel.version} + pom + import + + + + + com.google.guava + guava + ${guava.version} + + + + + junit + junit + ${junit.version} + test + + + org.mockito + mockito-all + ${mockito.version} + test + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + test + + + + + + + + + + maven-checkstyle-plugin + ${checkstyle.version} + + + honeycomb-checkstyle.xml + true + + + org/opendaylight/yang/gen/**, + + + + + + + check-license + + check + + process-sources + + HONEYCOMB_LICENSE.txt + true + true + ${project.build.directory}/checkstyle-license-result.xml + + + + + + check-logging + + check + + process-sources + + true + honeycomb-checkstyle-logging.xml + true + true + ${project.basedir} + **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang + **\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/,**\/src/main/yang\/ + ${project.build.directory}/checkstyle-logging-result.xml + + + + + check + + process-sources + + + + + io.fd.honeycomb.common + honeycomb-checkstyle + + 1.16.12-SNAPSHOT + + + + org.opendaylight.yangtools + checkstyle-logging + ${yangtools.version} + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven.javadoc.version} + + -Xdoclint:none + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + pre-unit-test + + prepare-agent + + + ${sonar.jacoco.reportPath} + + + + post-unit-test + + report + + + ${sonar.jacoco.reportPath} + + + + + + **/gen/** + **/generated-sources/** + **/yang-gen/** + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${enforcer.version} + + + enforce-maven + + + + 3.1.1 + + + + + enforce + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compile.plugin.version} + + + javac-with-errorprone + true + true + 1.8 + 1.8 + + + + org.codehaus.plexus + plexus-compiler-javac-errorprone + 2.5 + + + + com.google.errorprone + error_prone_core + 2.0.9 + + + + + org.apache.felix + maven-bundle-plugin + ${maven.bundle.version} + true + + + + + + maven-enforcer-plugin + + + maven-checkstyle-plugin + + + maven-dependency-plugin + + + maven-compiler-plugin + + + org.jacoco + jacoco-maven-plugin + + + org.apache.felix + maven-bundle-plugin + + + + + + + fdio-release + ${nexusproxy}/repositories/fd.io.release/ + + + fdio-snapshot + ${nexusproxy}/repositories/fd.io.snapshot/ + + + + + + + + true + never + + + false + + opendaylight-mirror + opendaylight-mirror + ${odl.nexusproxy}/repositories/public/ + + + diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml index 6c46aa67e..0bd874a6c 100644 --- a/common/impl-parent/pom.xml +++ b/common/impl-parent/pom.xml @@ -17,53 +17,25 @@ - org.opendaylight.controller - config-parent - 0.4.2-Beryllium-SR2 - + io.fd.honeycomb.common + honeycomb-parent + 1.16.12-SNAPSHOT + ../honeycomb-parent 4.0.0 - io.fd.honeycomb.common impl-parent 1.16.12-SNAPSHOT pom - APACHE_HEADER.txt - http://nexus.fd.io/content 4.1.0 1.2.0 - 1.3.2-Beryllium-SR2 - 2.0.2-Beryllium-SR2 - 1.0.2-Beryllium-SR2 1.0.8 - 1.3 - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.controller.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${netconf.version} - pom - import - com.google.inject @@ -80,6 +52,7 @@ guice-multibindings ${guice.version} + org.skinny-framework skinny-logback @@ -92,148 +65,6 @@ ${guice.version} test - - org.hamcrest - hamcrest-all - ${hamcrest.version} - test - - - - - - - maven-checkstyle-plugin - - - honeycomb-checkstyle.xml - true - - - - - - - check-license - - check - - process-sources - - HONEYCOMB_LICENSE.txt - true - true - ${project.build.directory}/checkstyle-license-result.xml - - - - - - check-logging - - check - - process-sources - - true - honeycomb-checkstyle-logging.xml - true - true - ${project.basedir} - **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang - **\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/,**\/src/main/yang\/ - ${project.build.directory}/checkstyle-logging-result.xml - - - - - check - - process-sources - - - - - io.fd.honeycomb.common - honeycomb-checkstyle - - 1.16.12-SNAPSHOT - - - - org.opendaylight.yangtools - checkstyle-logging - ${yangtools.version} - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - - - - maven-checkstyle-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - unpack-license - none - unpack - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - javac-with-errorprone - true - true - 1.8 - 1.8 - - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.5 - - - - com.google.errorprone - error_prone_core - 2.0.9 - - - - - - - - - - fdio-release - ${nexusproxy}/repositories/fd.io.release/ - - - fdio-snapshot - ${nexusproxy}/repositories/fd.io.snapshot/ - - diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml index 15d851a69..41367b2a7 100644 --- a/common/minimal-distribution-parent/pom.xml +++ b/common/minimal-distribution-parent/pom.xml @@ -18,20 +18,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.opendaylight.odlparent - odlparent - 1.6.2-Beryllium-SR2 - + io.fd.honeycomb.common + impl-parent + 1.16.12-SNAPSHOT + ../impl-parent 4.0.0 - io.fd.honeycomb.common minimal-distribution-parent 1.16.12-SNAPSHOT pom - http://nexus.fd.io/content #!/bin/sh - STATUS=100 @@ -50,19 +48,13 @@ done -Xms32m -Xmx128m -XX:MetaspaceSize=32m -XX:MaxMetaspaceSize=128m -client -Xms20m -Xmx32m -XX:MetaspaceSize=5m -XX:MaxMetaspaceSize=32m -XX:MaxMetaspaceExpansion=1m -Xss512k -XX:+UseSerialGC -Djava.compiler=NONE -Xverify:none -noverify -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 - 4.1.0 - 1.2.0 - 1.3.2-Beryllium-SR2 - 1.0.2-Beryllium-SR2 + + 1.19.1 9.3.11.v20160721 3.1.0 - 0.8.2-Beryllium-SR2 - 1.3.2-Beryllium-SR2 - 2.0.2-Beryllium-SR2 5.0.0 - 4.11 @@ -71,57 +63,6 @@ done - - org.opendaylight.controller - mdsal-artifacts - ${mdsal.controller.version} - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - ${mdsal.version} - pom - import - - - org.opendaylight.netconf - netconf-artifacts - ${netconf.version} - pom - import - - - org.opendaylight.netconf - restconf-artifacts - ${restconf.version} - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - pom - import - - - - com.google.inject - guice - ${guice.version} - - - net.jmob - guice.conf - ${guice.config.version} - - - com.google.inject.extensions - guice-multibindings - ${guice.version} - org.eclipse.jetty @@ -164,14 +105,6 @@ done org.osgi.core ${osgi.core.version} - - - - junit - junit - ${junit.version} - test - @@ -179,107 +112,6 @@ done - - maven-checkstyle-plugin - - - honeycomb-checkstyle.xml - true - - - - - - - check-license - - check - - process-sources - - HONEYCOMB_LICENSE.txt - true - true - ${project.build.directory}/checkstyle-license-result.xml - - - - - - check-logging - - check - - process-sources - - true - honeycomb-checkstyle-logging.xml - true - true - ${project.basedir} - **\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang - **\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/,**\/src/main/yang\/ - ${project.build.directory}/checkstyle-logging-result.xml - - - - - check - - process-sources - - - - - io.fd.honeycomb.common - honeycomb-checkstyle - - 1.16.12-SNAPSHOT - - - - org.opendaylight.yangtools - checkstyle-logging - ${yangtools.version} - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - - javac-with-errorprone - true - true - 1.8 - 1.8 - - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.5 - - - - com.google.errorprone - error_prone_core - 2.0.9 - - - org.apache.maven.plugins maven-jar-plugin @@ -419,57 +251,20 @@ done - maven-checkstyle-plugin + org.codehaus.gmaven + groovy-maven-plugin org.apache.maven.plugins - maven-dependency-plugin - 2.10 - - - unpack-license - none - unpack - - + maven-jar-plugin org.apache.maven.plugins - maven-compiler-plugin - - - javac-with-errorprone - true - true - 1.8 - 1.8 - - - - org.codehaus.plexus - plexus-compiler-javac-errorprone - 2.5 - - - - com.google.errorprone - error_prone_core - 2.0.9 - - + maven-dependency-plugin + + + maven-assembly-plugin - - - - fdio-release - ${nexusproxy}/repositories/fd.io.release/ - - - fdio-snapshot - ${nexusproxy}/repositories/fd.io.snapshot/ - - diff --git a/common/pom.xml b/common/pom.xml index 9c7c98a7a..d50d326a4 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -27,6 +27,7 @@ checkstyle + honeycomb-parent api-parent impl-parent minimal-assembly-descriptor diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml index f19b1cc86..9600de2e3 100644 --- a/infra/it/it-test/pom.xml +++ b/infra/it/it-test/pom.xml @@ -39,6 +39,10 @@ translate-impl ${project.version} + + org.opendaylight.controller + sal-binding-broker-impl + org.skinny-framework diff --git a/infra/minimal-distribution/pom.xml b/infra/minimal-distribution/pom.xml index d22f5b7b7..82f1cd1ad 100644 --- a/infra/minimal-distribution/pom.xml +++ b/infra/minimal-distribution/pom.xml @@ -36,26 +36,6 @@ io.fd.honeycomb.infra.distro.Main - - - - org.codehaus.gmaven - groovy-maven-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.maven.plugins - maven-dependency-plugin - - - maven-assembly-plugin - - - - diff --git a/infra/notification/api/pom.xml b/infra/notification/api/pom.xml index 81913591d..0220dc1fd 100644 --- a/infra/notification/api/pom.xml +++ b/infra/notification/api/pom.xml @@ -33,5 +33,9 @@ org.opendaylight.mdsal mdsal-dom-api + + org.opendaylight.mdsal + yang-binding + diff --git a/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java index e40b874d5..c3409888f 100644 --- a/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java +++ b/infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package io.fd.honeycomb.notification; import com.google.common.annotations.Beta; diff --git a/infra/translate-utils/pom.xml b/infra/translate-utils/pom.xml index f2b5a0c75..e1b14702a 100644 --- a/infra/translate-utils/pom.xml +++ b/infra/translate-utils/pom.xml @@ -47,6 +47,10 @@ org.opendaylight.controller sal-core-api + + org.opendaylight.controller + sal-binding-api + org.opendaylight.mdsal mdsal-binding-dom-codec -- cgit 1.2.3-korg