diff options
Diffstat (limited to 'infra')
33 files changed, 72 insertions, 34 deletions
diff --git a/infra/Readme.adoc b/infra/asciidoc/Readme.adoc index 33e882f8c..33e882f8c 100644 --- a/infra/Readme.adoc +++ b/infra/asciidoc/Readme.adoc diff --git a/infra/cfg-init/asciidoc/Readme.adoc b/infra/cfg-init/asciidoc/Readme.adoc new file mode 100644 index 000000000..ad514b960 --- /dev/null +++ b/infra/cfg-init/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += cfg-init + +Overview of cfg-init
\ No newline at end of file diff --git a/infra/cfg-init/pom.xml b/infra/cfg-init/pom.xml index 1a0098dd0..605d7c208 100644 --- a/infra/cfg-init/pom.xml +++ b/infra/cfg-init/pom.xml @@ -25,6 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>cfg-init</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/data-api/Readme.adoc b/infra/data-api/asciidoc/Readme.adoc index a13c5094f..a13c5094f 100644 --- a/infra/data-api/Readme.adoc +++ b/infra/data-api/asciidoc/Readme.adoc diff --git a/infra/data-api/pom.xml b/infra/data-api/pom.xml index c2d8465a3..eb615a8d1 100644 --- a/infra/data-api/pom.xml +++ b/infra/data-api/pom.xml @@ -26,6 +26,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>data-api</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/data-impl/Readme.adoc b/infra/data-impl/asciidoc/Readme.adoc index 61b2653b3..61b2653b3 100644 --- a/infra/data-impl/Readme.adoc +++ b/infra/data-impl/asciidoc/Readme.adoc diff --git a/infra/data-impl/pom.xml b/infra/data-impl/pom.xml index 8b4e29918..2d6f9fd61 100644 --- a/infra/data-impl/pom.xml +++ b/infra/data-impl/pom.xml @@ -26,6 +26,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>data-impl</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/impl/asciidoc/Readme.adoc b/infra/impl/asciidoc/Readme.adoc new file mode 100644 index 000000000..d629eaf0b --- /dev/null +++ b/infra/impl/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += honeycomb-impl + +Overview of honeycomb-impl
\ No newline at end of file diff --git a/infra/impl/pom.xml b/infra/impl/pom.xml index 572a079bf..feb0cbc4d 100644 --- a/infra/impl/pom.xml +++ b/infra/impl/pom.xml @@ -25,6 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> + <name>${project.artifactId}</name> <artifactId>honeycomb-impl</artifactId> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/it/asciidoc/Readme.adoc b/infra/it/asciidoc/Readme.adoc new file mode 100644 index 000000000..4a8ef58e1 --- /dev/null +++ b/infra/it/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += honeycomb-it-aggregator + +Overview of honeycomb-it-aggregator
\ No newline at end of file diff --git a/infra/it/it-test/asciidoc/Readme.adoc b/infra/it/it-test/asciidoc/Readme.adoc new file mode 100644 index 000000000..b22db5807 --- /dev/null +++ b/infra/it/it-test/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += honeycomb-it-test + +Overview of honeycomb-it-test
\ No newline at end of file diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml index bd2f9c0d6..2bbdff1a1 100644 --- a/infra/it/it-test/pom.xml +++ b/infra/it/it-test/pom.xml @@ -24,20 +24,25 @@ </parent> <modelVersion>4.0.0</modelVersion> - <groupId>io.fd.honeycomb</groupId> + <groupId>io.fd.honeycomb.it</groupId> <artifactId>honeycomb-it-test</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> + <properties> + <hc.infra.version>1.16.12-SNAPSHOT</hc.infra.version> + </properties> + <dependencies> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>io.fd.honeycomb</groupId> <artifactId>data-impl</artifactId> - <version>${project.version}</version> + <version>${hc.infra.version}</version> </dependency> <dependency> - <groupId>${project.groupId}</groupId> + <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> - <version>${project.version}</version> + <version>${hc.infra.version}</version> </dependency> <dependency> <groupId>org.opendaylight.controller</groupId> diff --git a/infra/it/pom.xml b/infra/it/pom.xml index 8ebbd7e21..5e1173413 100644 --- a/infra/it/pom.xml +++ b/infra/it/pom.xml @@ -15,15 +15,19 @@ --> <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"> - <groupId>io.fd.honeycomb.common</groupId> + <parent> + <groupId>io.fd.honeycomb.common</groupId> + <artifactId>honeycomb-parent</artifactId> + <version>1.16.12-SNAPSHOT</version> + <relativePath>../../common/honeycomb-parent</relativePath> + </parent> + + <groupId>io.fd.honeycomb.it</groupId> <artifactId>honeycomb-it-aggregator</artifactId> <version>1.16.12-SNAPSHOT</version> <name>honeycomb-it</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>3.1.1</maven> - </prerequisites> <modules> <module>test-model</module> diff --git a/infra/it/test-model/asciidoc/Readme.adoc b/infra/it/test-model/asciidoc/Readme.adoc new file mode 100644 index 000000000..a1a3715ea --- /dev/null +++ b/infra/it/test-model/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += honeycomb-test-model + +Overview of honeycomb-test-model
\ No newline at end of file diff --git a/infra/it/test-model/pom.xml b/infra/it/test-model/pom.xml index a2f47aa3c..909c4866f 100644 --- a/infra/it/test-model/pom.xml +++ b/infra/it/test-model/pom.xml @@ -22,8 +22,9 @@ </parent> <modelVersion>4.0.0</modelVersion> - <groupId>io.fd.honeycomb</groupId> + <groupId>io.fd.honeycomb.it</groupId> <artifactId>honeycomb-test-model</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/minimal-distribution/asciidoc/Readme.adoc b/infra/minimal-distribution/asciidoc/Readme.adoc new file mode 100644 index 000000000..1da86caab --- /dev/null +++ b/infra/minimal-distribution/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += minimal-distribution + +Overview of minimal-distribution
\ No newline at end of file diff --git a/infra/minimal-distribution/pom.xml b/infra/minimal-distribution/pom.xml index 82f1cd1ad..6e935b09b 100644 --- a/infra/minimal-distribution/pom.xml +++ b/infra/minimal-distribution/pom.xml @@ -25,12 +25,8 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>minimal-distribution</artifactId> - <version>1.16.12-SNAPSHOT</version> - <name>${project.artifactId}</name> - <prerequisites> - <maven>3.1.1</maven> - </prerequisites> + <version>1.16.12-SNAPSHOT</version> <properties> <main.class>io.fd.honeycomb.infra.distro.Main</main.class> diff --git a/infra/notification/api/asciidoc/Readme.adoc b/infra/notification/api/asciidoc/Readme.adoc new file mode 100644 index 000000000..676a76b54 --- /dev/null +++ b/infra/notification/api/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += notification-api + +Overview of notification-api
\ No newline at end of file diff --git a/infra/notification/api/pom.xml b/infra/notification/api/pom.xml index 0220dc1fd..8aa4b6b70 100644 --- a/infra/notification/api/pom.xml +++ b/infra/notification/api/pom.xml @@ -25,6 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>notification-api</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/notification/asciidoc/Readme.adoc b/infra/notification/asciidoc/Readme.adoc new file mode 100644 index 000000000..483018110 --- /dev/null +++ b/infra/notification/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += notification-aggregator + +Overview of notification-aggregator
\ No newline at end of file diff --git a/infra/notification/impl/asciidoc/Readme.adoc b/infra/notification/impl/asciidoc/Readme.adoc new file mode 100644 index 000000000..684cf3fe5 --- /dev/null +++ b/infra/notification/impl/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += notification-impl + +Overview of notification-impl
\ No newline at end of file diff --git a/infra/notification/impl/pom.xml b/infra/notification/impl/pom.xml index f289f75d1..4767fc958 100644 --- a/infra/notification/impl/pom.xml +++ b/infra/notification/impl/pom.xml @@ -25,6 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>notification-impl</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/notification/pom.xml b/infra/notification/pom.xml index 6d4c15fa0..e8e9e5cc5 100644 --- a/infra/notification/pom.xml +++ b/infra/notification/pom.xml @@ -16,21 +16,18 @@ <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.odlparent</groupId> - <artifactId>odlparent</artifactId> - <version>1.6.2-Beryllium-SR2</version> - <relativePath/> + <groupId>io.fd.honeycomb.common</groupId> + <artifactId>honeycomb-parent</artifactId> + <version>1.16.12-SNAPSHOT</version> + <relativePath>../../common/honeycomb-parent</relativePath> </parent> <groupId>io.fd.honeycomb</groupId> <artifactId>notification-aggregator</artifactId> <version>1.16.12-SNAPSHOT</version> - <name>notification</name> + <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>3.1.1</maven> - </prerequisites> <modules> <module>api</module> diff --git a/infra/pom.xml b/infra/pom.xml index 37ab3b42b..b21fe44ef 100644 --- a/infra/pom.xml +++ b/infra/pom.xml @@ -16,21 +16,19 @@ <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.odlparent</groupId> - <artifactId>odlparent</artifactId> - <version>1.6.2-Beryllium-SR2</version> - <relativePath/> + <groupId>io.fd.honeycomb.common</groupId> + <artifactId>honeycomb-parent</artifactId> + <version>1.16.12-SNAPSHOT</version> + <relativePath>../common/honeycomb-parent</relativePath> </parent> <groupId>io.fd.honeycomb</groupId> <artifactId>infra-aggregator</artifactId> <version>1.16.12-SNAPSHOT</version> - <name>infra</name> + <name>${project.artifactId}</name> <packaging>pom</packaging> <modelVersion>4.0.0</modelVersion> - <prerequisites> - <maven>3.1.1</maven> - </prerequisites> + <description>Aggregator for Honeycomb core (aka infrastructure/framework)</description> <modules> <module>data-api</module> diff --git a/infra/translate-api/Readme.adoc b/infra/translate-api/asciidoc/Readme.adoc index 9e208744a..9e208744a 100644 --- a/infra/translate-api/Readme.adoc +++ b/infra/translate-api/asciidoc/Readme.adoc diff --git a/infra/translate-api/pom.xml b/infra/translate-api/pom.xml index 594057284..374ed6c3e 100644 --- a/infra/translate-api/pom.xml +++ b/infra/translate-api/pom.xml @@ -25,6 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-api</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/translate-impl/Readme.adoc b/infra/translate-impl/asciidoc/Readme.adoc index 1e5c63604..1e5c63604 100644 --- a/infra/translate-impl/Readme.adoc +++ b/infra/translate-impl/asciidoc/Readme.adoc diff --git a/infra/translate-impl/pom.xml b/infra/translate-impl/pom.xml index 2a9280b87..7aff0a00f 100644 --- a/infra/translate-impl/pom.xml +++ b/infra/translate-impl/pom.xml @@ -25,6 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-impl</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/translate-spi/Readme.adoc b/infra/translate-spi/asciidoc/Readme.adoc index 755538c07..755538c07 100644 --- a/infra/translate-spi/Readme.adoc +++ b/infra/translate-spi/asciidoc/Readme.adoc diff --git a/infra/translate-spi/pom.xml b/infra/translate-spi/pom.xml index 8fb2cd1cb..0f630d065 100644 --- a/infra/translate-spi/pom.xml +++ b/infra/translate-spi/pom.xml @@ -25,6 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-spi</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> diff --git a/infra/translate-utils/Readme.adoc b/infra/translate-utils/Readme.adoc deleted file mode 100644 index 17ebb6c6a..000000000 --- a/infra/translate-utils/Readme.adoc +++ /dev/null @@ -1,3 +0,0 @@ -= Honeycomb translation layer utils - -Provides utility classes useful in translation layer implementation.
\ No newline at end of file diff --git a/infra/translate-utils/asciidoc/Readme.adoc b/infra/translate-utils/asciidoc/Readme.adoc new file mode 100644 index 000000000..569fc713c --- /dev/null +++ b/infra/translate-utils/asciidoc/Readme.adoc @@ -0,0 +1,3 @@ += translate-utils + +Overview of translate-utils
\ No newline at end of file diff --git a/infra/translate-utils/pom.xml b/infra/translate-utils/pom.xml index d05f6b7ba..ea1ece1de 100644 --- a/infra/translate-utils/pom.xml +++ b/infra/translate-utils/pom.xml @@ -25,6 +25,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>io.fd.honeycomb</groupId> <artifactId>translate-utils</artifactId> + <name>${project.artifactId}</name> <version>1.16.12-SNAPSHOT</version> <packaging>bundle</packaging> |