summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-09-20 15:09:55 +0200
committerMarek Gradzki <mgradzki@cisco.com>2016-09-21 10:58:41 +0000
commit5cfbc703cbf0183b76fb9d8157ffb860f429ec26 (patch)
treeaeec4ca2b98d5e85d9b0151123939e57f111d07a
parent7a7a31ae0a390113399119835bdaa3a4ed694170 (diff)
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 <mmarsale@cisco.com>
-rw-r--r--common/api-parent/pom.xml216
-rw-r--r--common/honeycomb-parent/pom.xml387
-rw-r--r--common/impl-parent/pom.xml179
-rw-r--r--common/minimal-distribution-parent/pom.xml231
-rw-r--r--common/pom.xml1
-rw-r--r--infra/it/it-test/pom.xml4
-rw-r--r--infra/minimal-distribution/pom.xml20
-rw-r--r--infra/notification/api/pom.xml4
-rw-r--r--infra/notification/api/src/main/java/io/fd/honeycomb/notification/NotificationCollector.java1
-rw-r--r--infra/translate-utils/pom.xml4
10 files changed, 503 insertions, 544 deletions
diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml
index 17466d0..6937fb6 100644
--- a/common/api-parent/pom.xml
+++ b/common/api-parent/pom.xml
@@ -14,155 +14,107 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
<parent>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>binding-parent</artifactId>
- <version>0.8.2-Beryllium-SR2</version>
- <relativePath/>
+ <groupId>io.fd.honeycomb.common</groupId>
+ <artifactId>honeycomb-parent</artifactId>
+ <version>1.16.12-SNAPSHOT</version>
+ <relativePath>../honeycomb-parent</relativePath>
</parent>
- <properties>
- <nexusproxy>http://nexus.fd.io/content</nexusproxy>
- </properties>
-
<modelVersion>4.0.0</modelVersion>
- <groupId>io.fd.honeycomb.common</groupId>
<artifactId>api-parent</artifactId>
<version>1.16.12-SNAPSHOT</version>
<packaging>pom</packaging>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <!-- Override checkstyle configuration to fit Honeycomb coding style-->
- <configLocation>honeycomb-checkstyle.xml</configLocation>
- <includeTestResources>true</includeTestResources>
- <!--TODO HONEYCOMB-155 enable fail on violation after issues are resolved + set in as errors in checkstyle xml-->
- </configuration>
- <executions>
-
- <!-- Override license check configuration to fit Honeycomb coding style-->
- <execution>
- <id>check-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <headerLocation>HONEYCOMB_LICENSE.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- <failsOnError>true</failsOnError>
- <outputFile>${project.build.directory}/checkstyle-license-result.xml</outputFile>
- </configuration>
- </execution>
-
- <!-- Add logging checks from yangtools -->
- <execution>
- <id>check-logging</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <failOnViolation>true</failOnViolation>
- <configLocation>honeycomb-checkstyle-logging.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <sourceDirectory>${project.basedir}</sourceDirectory>
- <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
- <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/,**\/src/main/yang\/</excludes>
- <outputFile>${project.build.directory}/checkstyle-logging-result.xml</outputFile>
- </configuration>
- </execution>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>io.fd.honeycomb.common</groupId>
- <artifactId>honeycomb-checkstyle</artifactId>
- <!-- Hardcoded version to prevent archetype generated projects to use their own project version -->
- <version>1.16.12-SNAPSHOT</version>
- </dependency>
- <!-- Necessary for logging checks -->
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>checkstyle-logging</artifactId>
- <version>${yangtools.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <!-- Deactivate strict java8 checks -->
- <!-- TODO HONEYCOMB-156 fix all the javadoc offenders of doclint -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>unpack-license</id>
- <phase>none</phase>
- <goals><goal>unpack</goal></goals>
- </execution>
- </executions>
- </plugin>
+ <!-- Yangtools, generate yang -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- Use google's error-prone static analysis-->
- <compilerId>javac-with-errorprone</compilerId>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
- <showWarnings>true</showWarnings>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-maven-plugin</artifactId>
+ <version>${yangtools.version}</version>
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-javac-errorprone</artifactId>
- <version>2.5</version>
- </dependency>
- <!-- override plexus-compiler-javac-errorprone's dependency on
- Error Prone with the latest version -->
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- <version>2.0.9</version>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>maven-sal-api-gen-plugin</artifactId>
+ <version>0.8.2-Beryllium-SR2</version>
+ <type>jar</type>
</dependency>
</dependencies>
+ <executions>
+ <execution>
+ <id>binding</id>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ <configuration>
+ <codeGenerators>
+ <generator>
+ <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+ <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+ </generator>
+ </codeGenerators>
+ <inspectDependencies>true</inspectDependencies>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${salGeneratorPath}</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
</plugin>
+ <!-- add generated yang classes to build -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-yang-sources</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${salGeneratorPath}</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
- <distributionManagement>
- <repository>
- <id>fdio-release</id>
- <url>${nexusproxy}/repositories/fd.io.release/</url>
- </repository>
- <snapshotRepository>
- <id>fdio-snapshot</id>
- <url>${nexusproxy}/repositories/fd.io.snapshot/</url>
- </snapshotRepository>
- </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>yang-binding</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yang-common</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml
new file mode 100644
index 0000000..4d6ca2f
--- /dev/null
+++ b/common/honeycomb-parent/pom.xml
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (c) 2016 Cisco and/or its affiliates.
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at:
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>io.fd.honeycomb.common</groupId>
+ <artifactId>honeycomb-parent</artifactId>
+ <version>1.16.12-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <properties>
+ <nexusproxy>http://nexus.fd.io/content</nexusproxy>
+ <odl.nexusproxy>https://nexus.opendaylight.org/content</odl.nexusproxy>
+
+ <!-- Default Sonar configuration -->
+ <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
+ <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+ <sonar.jacoco.reportPath>target/code-coverage/jacoco.exec</sonar.jacoco.reportPath>
+ <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+ <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**</sonar.exclusions>
+
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <!-- ODL dependencies -->
+ <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
+ <mdsal.version>2.0.2-Beryllium-SR2</mdsal.version>
+ <mdsal.controller.version>1.3.2-Beryllium-SR2</mdsal.controller.version>
+ <mdsalmodel.version>0.8.2-Beryllium-SR2</mdsalmodel.version>
+ <netconf.version>1.0.2-Beryllium-SR2</netconf.version>
+ <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
+ <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
+
+ <!-- dependencies -->
+ <junit.version>4.11</junit.version>
+ <mockito.version>1.9.5</mockito.version>
+ <hamcrest.version>1.3</hamcrest.version>
+ <guava.version>18.0</guava.version>
+
+ <!-- plugins -->
+ <checkstyle.version>2.16</checkstyle.version>
+ <maven.javadoc.version>2.10.3</maven.javadoc.version>
+ <jacoco.version>0.7.2.201409121644</jacoco.version>
+ <enforcer.version>1.4</enforcer.version>
+ <maven.compile.plugin.version>3.3</maven.compile.plugin.version>
+ <maven.bundle.version>3.0.0</maven.bundle.version>
+
+ <!-- checkstyle -->
+ <checkstyle.header.file>APACHE_HEADER.txt</checkstyle.header.file>
+ </properties>
+
+ <organization>
+ <name>fd.io</name>
+ <url>https://fd.io</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>https://jira.fd.io/</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://jenkins.fd.io/</url>
+ </ciManagement>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- ODL -->
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>yangtools-artifacts</artifactId>
+ <version>${yangtools.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>${mdsal.controller.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>mdsal-artifacts</artifactId>
+ <version>${mdsal.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-artifacts</artifactId>
+ <version>${netconf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>restconf-artifacts</artifactId>
+ <version>${restconf.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal.model</groupId>
+ <artifactId>mdsal-model-artifacts</artifactId>
+ <version>${mdsalmodel.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Utilities -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version>
+ </dependency>
+
+ <!-- Testing Dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- checkstyle -->
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>${checkstyle.version}</version>
+ <configuration>
+ <!-- Override checkstyle configuration to fit Honeycomb coding style-->
+ <configLocation>honeycomb-checkstyle.xml</configLocation>
+ <includeTestResources>true</includeTestResources>
+ <!--TODO HONEYCOMB-155 enable fail on violation after issues are resolved + set in as errors in checkstyle xml-->
+ <excludes>
+ org/opendaylight/yang/gen/**,
+ </excludes>
+ </configuration>
+ <executions>
+
+ <!-- Override license check configuration to fit Honeycomb coding style-->
+ <execution>
+ <id>check-license</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <headerLocation>HONEYCOMB_LICENSE.txt</headerLocation>
+ <failOnViolation>true</failOnViolation>
+ <failsOnError>true</failsOnError>
+ <outputFile>${project.build.directory}/checkstyle-license-result.xml</outputFile>
+ </configuration>
+ </execution>
+
+ <!-- Add logging checks from yangtools -->
+ <execution>
+ <id>check-logging</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <failOnViolation>true</failOnViolation>
+ <configLocation>honeycomb-checkstyle-logging.xml</configLocation>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <sourceDirectory>${project.basedir}</sourceDirectory>
+ <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
+ <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/,**\/src/main/yang\/</excludes>
+ <outputFile>${project.build.directory}/checkstyle-logging-result.xml</outputFile>
+ </configuration>
+ </execution>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>process-sources</phase>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>io.fd.honeycomb.common</groupId>
+ <artifactId>honeycomb-checkstyle</artifactId>
+ <!-- Hardcoded version to prevent archetype generated projects to use their own project version -->
+ <version>1.16.12-SNAPSHOT</version>
+ </dependency>
+ <!-- Necessary for logging checks -->
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>checkstyle-logging</artifactId>
+ <version>${yangtools.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <!-- Deactivate strict java8 checks -->
+ <!-- TODO HONEYCOMB-156 fix all the javadoc offenders of doclint -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
+ </configuration>
+ </plugin>
+ <!-- jacoco test coverage for sonar -->
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <id>pre-unit-test</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <destFile>${sonar.jacoco.reportPath}</destFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>post-unit-test</id>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <dataFile>${sonar.jacoco.reportPath}</dataFile>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ <exclude>**/yang-gen/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <!-- Enforce maven version -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${enforcer.version}</version>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.1.1</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Compile with google static analysis tool: error_prone -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compile.plugin.version}</version>
+ <configuration>
+ <!-- Use google's error-prone static analysis-->
+ <compilerId>javac-with-errorprone</compilerId>
+ <forceJavacCompilerUse>true</forceJavacCompilerUse>
+ <showWarnings>true</showWarnings>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac-errorprone</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <!-- override plexus-compiler-javac-errorprone's dependency on
+ Error Prone with the latest version -->
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_core</artifactId>
+ <version>2.0.9</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${maven.bundle.version}</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <distributionManagement>
+ <repository>
+ <id>fdio-release</id>
+ <url>${nexusproxy}/repositories/fd.io.release/</url>
+ </repository>
+ <snapshotRepository>
+ <id>fdio-snapshot</id>
+ <url>${nexusproxy}/repositories/fd.io.snapshot/</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <repositories>
+ <!-- Using only ODL stable releases -->
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>opendaylight-mirror</id>
+ <name>opendaylight-mirror</name>
+ <url>${odl.nexusproxy}/repositories/public/</url>
+ </repository>
+ </repositories>
+</project>
diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml
index 6c46aa6..0bd874a 100644
--- a/common/impl-parent/pom.xml
+++ b/common/impl-parent/pom.xml
@@ -17,53 +17,25 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>config-parent</artifactId>
- <version>0.4.2-Beryllium-SR2</version>
- <relativePath/>
+ <groupId>io.fd.honeycomb.common</groupId>
+ <artifactId>honeycomb-parent</artifactId>
+ <version>1.16.12-SNAPSHOT</version>
+ <relativePath>../honeycomb-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>io.fd.honeycomb.common</groupId>
<artifactId>impl-parent</artifactId>
<version>1.16.12-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <checkstyle.header.file>APACHE_HEADER.txt</checkstyle.header.file>
- <nexusproxy>http://nexus.fd.io/content</nexusproxy>
<guice.version>4.1.0</guice.version>
<guice.config.version>1.2.0</guice.config.version>
- <mdsal.controller.version>1.3.2-Beryllium-SR2</mdsal.controller.version>
- <mdsal.version>2.0.2-Beryllium-SR2</mdsal.version>
- <netconf.version>1.0.2-Beryllium-SR2</netconf.version>
<skinny.logback.version>1.0.8</skinny.logback.version>
- <hamcrest.version>1.3</hamcrest.version>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${mdsal.controller.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${mdsal.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-artifacts</artifactId>
- <version>${netconf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
<!-- DI -->
<dependency>
<groupId>com.google.inject</groupId>
@@ -80,6 +52,7 @@
<artifactId>guice-multibindings</artifactId>
<version>${guice.version}</version>
</dependency>
+ <!-- tests -->
<dependency>
<groupId>org.skinny-framework</groupId>
<artifactId>skinny-logback</artifactId>
@@ -92,148 +65,6 @@
<version>${guice.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <!-- Override checkstyle configuration to fit Honeycomb coding style-->
- <configLocation>honeycomb-checkstyle.xml</configLocation>
- <includeTestResources>true</includeTestResources>
- <!--TODO HONEYCOMB-155 enable fail on violation after issues are resolved + set in as errors in checkstyle xml-->
- </configuration>
- <executions>
-
- <!-- Override license check configuration to fit Honeycomb coding style-->
- <execution>
- <id>check-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <headerLocation>HONEYCOMB_LICENSE.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- <failsOnError>true</failsOnError>
- <outputFile>${project.build.directory}/checkstyle-license-result.xml</outputFile>
- </configuration>
- </execution>
-
- <!-- Add logging checks from yangtools -->
- <execution>
- <id>check-logging</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <failOnViolation>true</failOnViolation>
- <configLocation>honeycomb-checkstyle-logging.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <sourceDirectory>${project.basedir}</sourceDirectory>
- <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
- <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/,**\/src/main/yang\/</excludes>
- <outputFile>${project.build.directory}/checkstyle-logging-result.xml</outputFile>
- </configuration>
- </execution>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>io.fd.honeycomb.common</groupId>
- <artifactId>honeycomb-checkstyle</artifactId>
- <!-- Hardcoded version to prevent archetype generated projects to use their own project version -->
- <version>1.16.12-SNAPSHOT</version>
- </dependency>
- <!-- Necessary for logging checks -->
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>checkstyle-logging</artifactId>
- <version>${yangtools.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <!-- Deactivate strict java8 checks -->
- <!-- TODO HONEYCOMB-156 fix all the javadoc offenders of doclint -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>unpack-license</id>
- <phase>none</phase>
- <goals><goal>unpack</goal></goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- Use google's error-prone static analysis-->
- <compilerId>javac-with-errorprone</compilerId>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
- <showWarnings>true</showWarnings>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-javac-errorprone</artifactId>
- <version>2.5</version>
- </dependency>
- <!-- override plexus-compiler-javac-errorprone's dependency on
- Error Prone with the latest version -->
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- <version>2.0.9</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
-
- <distributionManagement>
- <repository>
- <id>fdio-release</id>
- <url>${nexusproxy}/repositories/fd.io.release/</url>
- </repository>
- <snapshotRepository>
- <id>fdio-snapshot</id>
- <url>${nexusproxy}/repositories/fd.io.snapshot/</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml
index 15d851a..41367b2 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">
<parent>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odlparent</artifactId>
- <version>1.6.2-Beryllium-SR2</version>
- <relativePath/>
+ <groupId>io.fd.honeycomb.common</groupId>
+ <artifactId>impl-parent</artifactId>
+ <version>1.16.12-SNAPSHOT</version>
+ <relativePath>../impl-parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>io.fd.honeycomb.common</groupId>
<artifactId>minimal-distribution-parent</artifactId>
<version>1.16.12-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <nexusproxy>http://nexus.fd.io/content</nexusproxy>
<start.script.template>
#!/bin/sh -
STATUS=100
@@ -50,19 +48,13 @@ done
<exec.parameters>-Xms32m -Xmx128m -XX:MetaspaceSize=32m -XX:MaxMetaspaceSize=128m</exec.parameters>
<exec.parameters.minimal>-client -Xms20m -Xmx32m -XX:MetaspaceSize=5m -XX:MaxMetaspaceSize=32m -XX:MaxMetaspaceExpansion=1m -Xss512k -XX:+UseSerialGC -Djava.compiler=NONE -Xverify:none -noverify</exec.parameters.minimal>
<debug.parameters>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005</debug.parameters>
- <guice.version>4.1.0</guice.version>
- <guice.config.version>1.2.0</guice.config.version>
- <restconf.version>1.3.2-Beryllium-SR2</restconf.version>
- <netconf.version>1.0.2-Beryllium-SR2</netconf.version>
+
+ <!-- Jersey versions to run RESTCONF-->
<jersey.version>1.19.1</jersey.version>
<jetty.version>9.3.11.v20160721</jetty.version>
<servlet.version>3.1.0</servlet.version>
- <yangtools.version>0.8.2-Beryllium-SR2</yangtools.version>
- <mdsal.controller.version>1.3.2-Beryllium-SR2</mdsal.controller.version>
- <mdsal.version>2.0.2-Beryllium-SR2</mdsal.version>
<!-- Used by mdsal as provided/runtime dependency-->
<osgi.core.version>5.0.0</osgi.core.version>
- <junit.version>4.11</junit.version>
<!-- Use /dev/urandom instead of /dev/random during tests to speed up execution
http://stackoverflow.com/questions/137212/how-to-solve-performance-problem-with-java-securerandom
-->
@@ -71,57 +63,6 @@ done
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${mdsal.controller.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>${mdsal.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-artifacts</artifactId>
- <version>${netconf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>restconf-artifacts</artifactId>
- <version>${restconf.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yangtools-artifacts</artifactId>
- <version>${yangtools.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <!-- DI -->
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>${guice.version}</version>
- </dependency>
- <dependency>
- <groupId>net.jmob</groupId>
- <artifactId>guice.conf</artifactId>
- <version>${guice.config.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- <version>${guice.version}</version>
- </dependency>
<!-- Jersey + Jetty for RESTCONF -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -164,14 +105,6 @@ done
<artifactId>org.osgi.core</artifactId>
<version>${osgi.core.version}</version>
</dependency>
-
- <!-- Junit for test -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -180,107 +113,6 @@ done
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <!-- Override checkstyle configuration to fit Honeycomb coding style-->
- <configLocation>honeycomb-checkstyle.xml</configLocation>
- <includeTestResources>true</includeTestResources>
- <!--TODO HONEYCOMB-155 enable fail on violation after issues are resolved + set in as errors in checkstyle xml-->
- </configuration>
- <executions>
-
- <!-- Override license check configuration to fit Honeycomb coding style-->
- <execution>
- <id>check-license</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <headerLocation>HONEYCOMB_LICENSE.txt</headerLocation>
- <failOnViolation>true</failOnViolation>
- <failsOnError>true</failsOnError>
- <outputFile>${project.build.directory}/checkstyle-license-result.xml</outputFile>
- </configuration>
- </execution>
-
- <!-- Add logging checks from yangtools -->
- <execution>
- <id>check-logging</id>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- <configuration>
- <failOnViolation>true</failOnViolation>
- <configLocation>honeycomb-checkstyle-logging.xml</configLocation>
- <consoleOutput>true</consoleOutput>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <sourceDirectory>${project.basedir}</sourceDirectory>
- <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
- <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/,**\/src/main/xtend-gen\/,**\/src/main/yang\/</excludes>
- <outputFile>${project.build.directory}/checkstyle-logging-result.xml</outputFile>
- </configuration>
- </execution>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <phase>process-sources</phase>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>io.fd.honeycomb.common</groupId>
- <artifactId>honeycomb-checkstyle</artifactId>
- <!-- Hardcoded version to prevent archetype generated projects to use their own project version -->
- <version>1.16.12-SNAPSHOT</version>
- </dependency>
- <!-- Necessary for logging checks -->
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>checkstyle-logging</artifactId>
- <version>${yangtools.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <!-- Deactivate strict java8 checks -->
- <!-- TODO HONEYCOMB-156 fix all the javadoc offenders of doclint -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <!-- Use google's error-prone static analysis-->
- <compilerId>javac-with-errorprone</compilerId>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
- <showWarnings>true</showWarnings>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-javac-errorprone</artifactId>
- <version>2.5</version>
- </dependency>
- <!-- override plexus-compiler-javac-errorprone's dependency on
- Error Prone with the latest version -->
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- <version>2.0.9</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
@@ -419,57 +251,20 @@ done
</pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
- <executions>
- <execution>
- <id>unpack-license</id>
- <phase>none</phase>
- <goals><goal>unpack</goal></goals>
- </execution>
- </executions>
+ <artifactId>maven-jar-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <!-- Use google's error-prone static analysis-->
- <compilerId>javac-with-errorprone</compilerId>
- <forceJavacCompilerUse>true</forceJavacCompilerUse>
- <showWarnings>true</showWarnings>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-javac-errorprone</artifactId>
- <version>2.5</version>
- </dependency>
- <!-- override plexus-compiler-javac-errorprone's dependency on
- Error Prone with the latest version -->
- <dependency>
- <groupId>com.google.errorprone</groupId>
- <artifactId>error_prone_core</artifactId>
- <version>2.0.9</version>
- </dependency>
- </dependencies>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
</plugin>
</plugins>
</build>
-
- <distributionManagement>
- <repository>
- <id>fdio-release</id>
- <url>${nexusproxy}/repositories/fd.io.release/</url>
- </repository>
- <snapshotRepository>
- <id>fdio-snapshot</id>
- <url>${nexusproxy}/repositories/fd.io.snapshot/</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/common/pom.xml b/common/pom.xml
index 9c7c98a..d50d326 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,6 +27,7 @@
<modules>
<module>checkstyle</module>
+ <module>honeycomb-parent</module>
<module>api-parent</module>
<module>impl-parent</module>
<module>minimal-assembly-descriptor</module>
diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml
index f19b1cc..9600de2 100644
--- a/infra/it/it-test/pom.xml
+++ b/infra/it/it-test/pom.xml
@@ -40,6 +40,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-binding-broker-impl</artifactId>
+ </dependency>
+ <dependency>
<!-- We want logs from these tests -->
<groupId>org.skinny-framework</groupId>
<artifactId>skinny-logback</artifactId>
diff --git a/infra/minimal-distribution/pom.xml b/infra/minimal-distribution/pom.xml
index d22f5b7..82f1cd1 100644
--- a/infra/minimal-distribution/pom.xml
+++ b/infra/minimal-distribution/pom.xml
@@ -36,26 +36,6 @@
<main.class>io.fd.honeycomb.infra.distro.Main</main.class>
</properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- DI-->
<dependency>
diff --git a/infra/notification/api/pom.xml b/infra/notification/api/pom.xml
index 8191359..0220dc1 100644
--- a/infra/notification/api/pom.xml
+++ b/infra/notification/api/pom.xml
@@ -33,5 +33,9 @@
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-dom-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.mdsal</groupId>
+ <artifactId>yang-binding</artifactId>
+ </dependency>
</dependencies>
</project>
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 e40b874..c340988 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 f2b5a0c..e1b1470 100644
--- a/infra/translate-utils/pom.xml
+++ b/infra/translate-utils/pom.xml
@@ -48,6 +48,10 @@
<artifactId>sal-core-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>sal-binding-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-dom-codec</artifactId>
</dependency>