diff options
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | dbc-client/misc/dbc-client | 122 | ||||
| -rw-r--r-- | dbc-client/pom.xml | 197 | ||||
| -rw-r--r-- | dbc-client/version.properties (renamed from version.properties) | 2 | ||||
| -rw-r--r-- | dmaap-bc/misc/LocalKey (renamed from misc/LocalKey) | 0 | ||||
| -rw-r--r-- | dmaap-bc/misc/PolicyEngineApi.properties.tmpl (renamed from misc/PolicyEngineApi.properties.tmpl) | 0 | ||||
| -rw-r--r-- | dmaap-bc/misc/dbc-api.jks (renamed from misc/dbc-api.jks) | bin | 3740 -> 3740 bytes | |||
| -rw-r--r-- | dmaap-bc/misc/dmaapbc (renamed from misc/dmaapbc) | 2 | ||||
| -rw-r--r-- | dmaap-bc/misc/dmaapbc.properties.tmpl (renamed from misc/dmaapbc.properties.tmpl) | 0 | ||||
| -rw-r--r-- | dmaap-bc/misc/doaction (renamed from misc/doaction) | 0 | ||||
| -rw-r--r-- | dmaap-bc/misc/havecert.tmpl (renamed from misc/havecert.tmpl) | 0 | ||||
| -rw-r--r-- | dmaap-bc/misc/log4j.properties.tmpl (renamed from misc/log4j.properties.tmpl) | 0 | ||||
| -rw-r--r-- | dmaap-bc/misc/logback.xml (renamed from misc/logback.xml) | 0 | ||||
| -rw-r--r-- | dmaap-bc/misc/opensource.env (renamed from misc/opensource.env) | 0 | ||||
| -rw-r--r-- | dmaap-bc/misc/org.onap.dmaap-bc.trust.jks (renamed from misc/org.onap.dmaap-bc.trust.jks) | bin | 1413 -> 1413 bytes | |||
| -rw-r--r-- | dmaap-bc/misc/policyLogger.properties (renamed from misc/policyLogger.properties) | 0 | ||||
| -rw-r--r-- | dmaap-bc/pom.xml | 408 | ||||
| -rw-r--r-- | dmaap-bc/src/main/resources/docker-compose.yml (renamed from src/main/resources/docker-compose.yml) | 0 | ||||
| -rw-r--r-- | dmaap-bc/src/main/resources/docker-databus-controller.conf (renamed from src/main/resources/docker-databus-controller.conf) | 0 | ||||
| -rw-r--r-- | dmaap-bc/src/main/webapp/HelloJetty.html (renamed from src/main/webapp/HelloJetty.html) | 0 | ||||
| -rw-r--r-- | dmaap-bc/src/main/webapp/WEB-INF/log4j.xml (renamed from src/main/webapp/WEB-INF/log4j.xml) | 0 | ||||
| -rw-r--r-- | dmaap-bc/src/main/webapp/WEB-INF/web.xml (renamed from src/main/webapp/WEB-INF/web.xml) | 0 | ||||
| -rw-r--r-- | dmaap-bc/src/main/webapp/index.jsp (renamed from src/main/webapp/index.jsp) | 0 | ||||
| -rw-r--r-- | dmaap-bc/version.properties | 35 | ||||
| -rw-r--r-- | pom.xml | 421 |
25 files changed, 825 insertions, 374 deletions
@@ -28,6 +28,12 @@ Data Movement as a Platform (DMaaP) Bus Controller provides an API for other ONA A typical DMaaP resource is a Data Router Feed or a Message Router Topic, and their associated publishers and subscribers. Other infrastucture resources such as DR Nodes and MR Clusters are also provisioned through this API. +### Sub-components + +This project produces the following mvn modules in their respective sub-directories: +- dmaap-bc is a docker image intended to be used to instantiate the DMaaP Bus Controller container +- dbc-client is a docker image intended to serve as a temporary http client of the Bus Controller API. It will be instantiated in a container that is a Helm hook (e.g. post-install hook) that knows how to invoke the Bus Controller API. + ### Build Instructions for a Continuous Integration environment using Jenkins When this component is included in a Continuous Integration environment, such as structured by the Linux Foundation, the artifacts can be created and deployed via Jenkins. The following maven targets are currently supported in the Build step: @@ -38,7 +44,7 @@ clean install ### Build Instructions for external developers -This project is organized as a mvn project for a jar package. +This project is organized as a mvn project for a docker image. After cloning from this git repo: ``` @@ -119,8 +125,8 @@ DMAAPBC_PE_AAF_ENV=TBD Then the following steps could be used to pull and run the Bus Controller. (onap-nexus is just an example) ``` $ -$ docker pull nexus3.onap.org:10003/onap/dmaap/buscontroller:latest -$ docker run -d -p 18080:8080 -p 18443:8443 -v /tmp/docker-databus-controller.conf:/opt/app/config/conf nexus3.onap.org:10003/onap/dmaap/buscontroller:latest +$ docker pull nexus3.onap.org:10003/onap/dmaap/dmaap-bc:latest +$ docker run -d -p 18080:8080 -p 18443:8443 -v /tmp/docker-databus-controller.conf:/opt/app/config/conf nexus3.onap.org:10003/onap/dmaap/dmaap-bc:latest ``` ### Properties diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client new file mode 100644 index 0000000..42e7282 --- /dev/null +++ b/dbc-client/misc/dbc-client @@ -0,0 +1,122 @@ +#!/bin/sh +# +# ============LICENSE_START========================================== +# org.onap.dmaap +# =================================================================== +# Copyright © 2019 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# 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. +# ============LICENSE_END============================================ +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +# + +umask 0022 +TZ=GMT0 +COMPONENT=dbc-client +APP_ROOT=/opt/app/$COMPONENT +USER=root +export TZ +PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin +export PATH +CONFIGMAP_ROOT=${CONFIGMAP_ROOT:-/opt/app/config} +CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf/dbc-client.env + + + + +config() { + echo "ENTER config" + set -x + if [ ! -d $APP_ROOT ] + then + echo "Expected app root directory $APP_ROOT does not exist" + exit 1 + fi + cd $APP_ROOT + find . -type f -exec ls -l {} \; + find $CONFIGMAP_ROOT -type f -exec ls -l {} \; + if [ ! -f $CONTAINER_CONFIG ] + then + echo "WARNING: Expected env file $CONTAINER_CONFIG not found. Default behaviors in effect" + else + source $CONTAINER_CONFIG + fi + + if [ "$DMAAPBC_WAIT_TO_EXIT" != "Y" ] + then + echo "Creating $APP_ROOT/ok_to_exit so no waiting..." + > $APP_ROOT/ok_to_exit + else + echo "Not creating $APP_ROOT/ok_to_exit" + fi + + if [ ! -f $APP_ROOT/misc/cert-client-init.sh ] + then + echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore" + exit 1 + fi + $APP_ROOT/misc/cert-client-init.sh + + set +x +} + + +init() { + echo "ENTER init" + if [ ! -d $CONFIGMAP_ROOT ] + then + echo $CONFIGMAP_ROOT does not exist + return + fi + + #loop on get /dmaap until we get a good response to indicate other provisioning can continue + rc=999 + while [ $rc != "200" ] + do + sleep 10 + rc=`curl -s -o /dev/null -I -w "%{http_code}" -X GET -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap` + echo "get dmaap response=${rc}" + done +} +doprov() { + + cd $CONFIGMAP_ROOT + pwd + # order is important in this next list + for uri in dmaap dcaeLocations mr_clusters topics feeds mr_clients dr_pubs dr_subs + do + if [ -d ${uri} ] + then + for j in `ls ${uri}/*.json` + do + echo "POST $j to $uri" + rc=`curl -v -X POST -w "%{http_code}" -H "Content-Type: application/json" -d @${j} http://dmaap-bc:8080/webapi/${uri}` + echo "response=$rc" + done + fi + done +} + +set -x +config +init +doprov + +echo "Check $APP_ROOT/ok_to_exit" +while [ ! -f $APP_ROOT/ok_to_exit ] +do + echo "$APP_ROOT/ok_to_exit does not exist. Sticking around for debugging..." + sleep 10 +done +exit 0 diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml new file mode 100644 index 0000000..945eeee --- /dev/null +++ b/dbc-client/pom.xml @@ -0,0 +1,197 @@ +<?xml version="1.0"?> +<!-- + ============LICENSE_START========================================== + org.onap.dmaap + =================================================================== + Copyright © 2018 AT&T Intellectual Property. All rights reserved. + =================================================================== + 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. + ============LICENSE_END============================================ + ECOMP is a trademark and service mark of AT&T Intellectual Property. +--> +<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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.onap.dmaap.buscontroller</groupId> + <artifactId>dbc-client</artifactId> + <version>${artifact.version}</version> + <name>dbc-client</name> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.2.2</version> + <relativePath/> + </parent> + <build> + <finalName>dbc-client</finalName> + + <plugins> + + + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <serverId>ecomp-staging</serverId> + <nexusUrl>${nexusproxy}</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + </configuration> + </plugin> + + <!-- for Distribution management --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <versionRange>[2.10,)</versionRange> + <phase>install</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore/> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> + <profile> + <id>docker</id> + <properties> + <skipDockerBuild>false</skipDockerBuild> + <skipDockerTag>false</skipDockerTag> + <skipTests>true</skipTests> + </properties> + <build> + <plugins> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>${docker.maven.plugin.version}</version> + <configuration> + <baseImage>alpine:3.8</baseImage> + <imageName>${onap.nexus.dockerregistry.daily}/${docker.image}</imageName> + <entryPoint>["./bin/dbc-client", "deploy"]</entryPoint> + <serverId>${onap.nexus.dockerregistry.daily}</serverId> + <skipDockerBuild>false</skipDockerBuild> + <imageTags> + <imageTag>${artifact.version}</imageTag> + <imageTag>latest</imageTag> + </imageTags> + <volumes> + <volume>/opt/app/dbc-client/log</volume> + </volumes> + <forceTags>true</forceTags> + <user>root</user> + <resources> + <resource> + <targetPath>/opt/app/dmaapbc/etc</targetPath> + <directory>${multiproject.basedir}/dbc-client</directory> + <include>version.properties</include> + </resource> + <resource> + <targetPath>/opt/app/dbc-client/misc</targetPath> + <directory>${multiproject.basedir}/misc</directory> + <include>cert-client-init.sh</include> + </resource> + <resource> + <targetPath>/opt/app/dbc-client/bin</targetPath> + <directory>${multiproject.basedir}/dbc-client/misc</directory> + <include>dbc-client</include> + </resource> + </resources> + <runs> + <run> apk add --no-cache curl </run> + <run>chmod +x /opt/app/dbc-client/misc/cert-client-init.sh</run> + <run>chmod +x /opt/app/dbc-client/bin/*</run> + <run>mkdir /opt/app/dbc-client/logs</run> + </runs> + <workdir>/opt/app/dbc-client</workdir> + </configuration> + <executions> + <execution> + <id>default</id> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencyManagement> + </dependencyManagement> + + <properties> + <multiproject.basedir>${basedir}/..</multiproject.basedir> + <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version> + <jersey.version>2.16</jersey.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <jettyVersion>9.4.12.RC2</jettyVersion> + <eelf.version>1.0.0</eelf.version> + <swagger.version>1.5.19</swagger.version> + <artifact.version>1.0.2</artifact.version> + <!-- SONAR --> + <jacoco.version>0.7.7.201606060606</jacoco.version> + <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> + <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> + <!-- Default Sonar configuration --> + <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.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**,**/pax/**</sonar.exclusions> + + <!-- docker image --> + <docker.image>onap/dmaap/dbc-client</docker.image> + + <nexusproxy>https://nexus.onap.org</nexusproxy> + <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> + + <!-- for Distribution Management --> + <sitePath>/content/sites/site/org/onap/dmaap/dbc-client/${artifact.version}</sitePath> + </properties> + <description>Packaging Platform (DMaaP) HTTP Client for Bus Controller Provisioning.</description> +</project> diff --git a/version.properties b/dbc-client/version.properties index 8db0bb1..895a84e 100644 --- a/version.properties +++ b/dbc-client/version.properties @@ -27,7 +27,7 @@ major=1 minor=0 -patch=26 +patch=2 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins diff --git a/misc/LocalKey b/dmaap-bc/misc/LocalKey index 38ede55..38ede55 100644 --- a/misc/LocalKey +++ b/dmaap-bc/misc/LocalKey diff --git a/misc/PolicyEngineApi.properties.tmpl b/dmaap-bc/misc/PolicyEngineApi.properties.tmpl index 248b288..248b288 100644 --- a/misc/PolicyEngineApi.properties.tmpl +++ b/dmaap-bc/misc/PolicyEngineApi.properties.tmpl diff --git a/misc/dbc-api.jks b/dmaap-bc/misc/dbc-api.jks Binary files differindex 66142d3..66142d3 100644 --- a/misc/dbc-api.jks +++ b/dmaap-bc/misc/dbc-api.jks diff --git a/misc/dmaapbc b/dmaap-bc/misc/dmaapbc index aca8f9e..f1e8ae7 100644 --- a/misc/dmaapbc +++ b/dmaap-bc/misc/dmaapbc @@ -213,7 +213,7 @@ case "$1" in 'deploy') config start - init + #init wait ;; 'start') diff --git a/misc/dmaapbc.properties.tmpl b/dmaap-bc/misc/dmaapbc.properties.tmpl index 40ce8f5..40ce8f5 100644 --- a/misc/dmaapbc.properties.tmpl +++ b/dmaap-bc/misc/dmaapbc.properties.tmpl diff --git a/misc/doaction b/dmaap-bc/misc/doaction index 7fee592..7fee592 100644 --- a/misc/doaction +++ b/dmaap-bc/misc/doaction diff --git a/misc/havecert.tmpl b/dmaap-bc/misc/havecert.tmpl index a3a5ff8..a3a5ff8 100644 --- a/misc/havecert.tmpl +++ b/dmaap-bc/misc/havecert.tmpl diff --git a/misc/log4j.properties.tmpl b/dmaap-bc/misc/log4j.properties.tmpl index 2a30bf5..2a30bf5 100644 --- a/misc/log4j.properties.tmpl +++ b/dmaap-bc/misc/log4j.properties.tmpl diff --git a/misc/logback.xml b/dmaap-bc/misc/logback.xml index 2af00f1..2af00f1 100644 --- a/misc/logback.xml +++ b/dmaap-bc/misc/logback.xml diff --git a/misc/opensource.env b/dmaap-bc/misc/opensource.env index 80d82f8..80d82f8 100644 --- a/misc/opensource.env +++ b/dmaap-bc/misc/opensource.env diff --git a/misc/org.onap.dmaap-bc.trust.jks b/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks Binary files differindex 00cc35e..00cc35e 100644 --- a/misc/org.onap.dmaap-bc.trust.jks +++ b/dmaap-bc/misc/org.onap.dmaap-bc.trust.jks diff --git a/misc/policyLogger.properties b/dmaap-bc/misc/policyLogger.properties index 6b9ad99..6b9ad99 100644 --- a/misc/policyLogger.properties +++ b/dmaap-bc/misc/policyLogger.properties diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml new file mode 100644 index 0000000..f7f2bc1 --- /dev/null +++ b/dmaap-bc/pom.xml @@ -0,0 +1,408 @@ +<?xml version="1.0"?> +<!-- + ============LICENSE_START========================================== + org.onap.dmaap + =================================================================== + Copyright © 2018 AT&T Intellectual Property. All rights reserved. + =================================================================== + 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. + ============LICENSE_END============================================ + ECOMP is a trademark and service mark of AT&T Intellectual Property. +--> +<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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.onap.dmaap.buscontroller</groupId> + <artifactId>dmaap-bc</artifactId> + <version>${artifact.version}</version> + <name>dmaap-bc</name> + <parent> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.2.2</version> + <relativePath/> + </parent> + <build> + <finalName>dmaap-bc</finalName> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <message>No Snapshots Allowed!</message> + <excludes> + <exclude>org.onap.dmaap.dbcapi:dbcapi</exclude> + <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude> + <exclude>org.onap.aaf.authz:aaf-misc-env</exclude> + <exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude> + <exclude>org.onap.aaf.authz:aaf-auth-client</exclude> + <exclude>org.onap.aaf.authz:aaf-cadi-core</exclude> + <exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude> + </excludes> + </requireReleaseDeps> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + + <!-- Package an Uber jar --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <executions> + <!-- Run shade goal on package phase --> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> + <!-- this filter section is needed to avoid runtime error: + java.lang.SecurityException: Invalid signature file digest for Manifest main attributes + suggestion found at: https://stackoverflow.com/q/999489 + --> + <filters> + <filter> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> + </excludes> + </filter> + </filters> + <transformers> + <!-- NOTE: Need the following transformer else gets "Could not resolve type id 'https' into a subtype" error + Solution found from here: + http://stackoverflow.com/questions/27543060/why-does-dropwizard-configuration-is-not-working + Some more context here: + https://github.com/dropwizard/dropwizard/issues/455 --> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <!-- add Main-Class to manifest file --> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>org.onap.dmaap.dbcapi.server.Main</mainClass> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <serverId>ecomp-staging</serverId> + <nexusUrl>${nexusproxy}</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + </configuration> + </plugin> + + <!-- for Distribution management --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> + + </plugins> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <versionRange>[2.10,)</versionRange> + <phase>install</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore/> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <profiles> + <profile> + <id>docker</id> + <properties> + <skipDockerBuild>false</skipDockerBuild> + <skipDockerTag>false</skipDockerTag> + <skipTests>true</skipTests> + </properties> + <build> + <plugins> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>${docker.maven.plugin.version}</version> + <configuration> + <baseImage>java:openjdk-8-jre</baseImage> + <imageName>${onap.nexus.dockerregistry.daily}/${docker.image}</imageName> + <entryPoint>["./bin/dmaapbc", "deploy"]</entryPoint> + <serverId>${onap.nexus.dockerregistry.daily}</serverId> + <skipDockerBuild>false</skipDockerBuild> + <imageTags> + <imageTag>${artifact.version}</imageTag> + <imageTag>latest</imageTag> + </imageTags> + <volumes> + <volume>/opt/app/dmaapbc/log</volume> + </volumes> + <forceTags>true</forceTags> + <user>root</user> + <resources> + <resource> + <targetPath>/opt/app/dmaapbc/lib</targetPath> + <directory>${multiproject.basedir}/dmaap-bc/target</directory> + <include>dmaap-bc.jar</include> + </resource> + <resource> + <targetPath>/opt/app/dmaapbc/etc</targetPath> + <directory>${multiproject.basedir}/dmaap-bc/misc</directory> + <include>LocalKey</include> + <include>logback.xml</include> + <include>org.onap.dmaap-bc.trust.jks</include> + <include>dbc-api.jks</include> + </resource> + <resource> + <targetPath>/opt/app/dmaapbc/etc</targetPath> + <directory>${multiproject.basedir}/dmaap-bc</directory> + <include>version.properties</include> + </resource> + <resource> + <targetPath>/opt/app/dmaapbc/misc</targetPath> + <directory>${multiproject.basedir}/dmaap-bc/misc</directory> + <include>opensource.env</include> + <include>*.tmpl</include> + </resource> + <resource> + <targetPath>/opt/app/dmaapbc/misc</targetPath> + <directory>${multiproject.basedir}/misc</directory> + <include>cert-client-init.sh</include> + </resource> + <resource> + <targetPath>/opt/app/dmaapbc/bin</targetPath> + <directory>${multiproject.basedir}/dmaap-bc/misc</directory> + <include>dmaapbc</include> + <include>doaction</include> + </resource> + </resources> + <runs> + <run>mv /opt/app/dmaapbc/etc/dbc-api.jks /opt/app/dmaapbc/etc/keystore</run> + <run>chmod 600 /opt/app/dmaapbc/etc/keystore</run> + <run>chmod 600 /opt/app/dmaapbc/etc/org.onap.dmaap-bc.trust.jks</run> + <run>chmod +x /opt/app/dmaapbc/misc/cert-client-init.sh</run> + <run>chmod +x /opt/app/dmaapbc/bin/*</run> + <run>mkdir /opt/app/dmaapbc/logs</run> + <run>mkdir /opt/app/dmaapbc/www</run> + <run>mkdir /opt/app/dmaapbc/www/doc</run> + </runs> + <workdir>/opt/app/dmaapbc</workdir> + </configuration> + <executions> + <execution> + <id>default</id> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.glassfish.jersey</groupId> + <artifactId>jersey-bom</artifactId> + <version>${jersey.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-core</artifactId> + <version>${swagger.version}</version> + </dependency> + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-jersey2-jaxrs</artifactId> + <version>${swagger.version}</version> + </dependency> + <dependency> + <groupId>io.swagger</groupId> + <artifactId>swagger-annotations</artifactId> + <version>${swagger.version}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.containers</groupId> + <artifactId>jersey-container-servlet-core</artifactId> + <!-- use the following artifactId if you don't need servlet 2.x compatibility --> + <!-- artifactId>jersey-container-servlet</artifactId --> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-moxy</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>${jettyVersion}</version> + </dependency> + <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> + <version>2.1.7</version> + <classifier>full</classifier> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>${jettyVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlets</artifactId> + <version>${jettyVersion}</version> + <scope>compile</scope> + </dependency> + <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple --> + <dependency> + <groupId>com.googlecode.json-simple</groupId> + <artifactId>json-simple</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.11</version> + </dependency> + <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql --> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>42.2.5</version> + </dependency> + + <dependency> + <groupId>org.onap.dmaap.dbcapi</groupId> + <artifactId>dbcapi</artifactId> + <version>1.0.23-SNAPSHOT</version> + </dependency> + </dependencies> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10.4</version> + <configuration> + <failOnError>false</failOnError> + <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> + <docletArtifact> + <groupId>org.umlgraph</groupId> + <artifactId>umlgraph</artifactId> + <version>5.6</version> + </docletArtifact> + <additionalparam>-views</additionalparam> + <useStandardDocletOptions>true</useStandardDocletOptions> + </configuration> + </plugin> + </plugins> + </reporting> + + <distributionManagement> + <site> + <id>ecomp-site</id> + <url>dav:${nexusproxy}${sitePath}</url> + </site> + </distributionManagement> + <properties> + <multiproject.basedir>${basedir}/..</multiproject.basedir> + <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version> + <jersey.version>2.16</jersey.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <jettyVersion>9.4.12.RC2</jettyVersion> + <eelf.version>1.0.0</eelf.version> + <swagger.version>1.5.19</swagger.version> + <artifact.version>1.1.1</artifact.version> + <!-- SONAR --> + <jacoco.version>0.7.7.201606060606</jacoco.version> + <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> + <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> + <!-- Default Sonar configuration --> + <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.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**,**/pax/**</sonar.exclusions> + + <!-- docker image --> + <docker.image>onap/dmaap/dmaap-bc</docker.image> + + <nexusproxy>https://nexus.onap.org</nexusproxy> + <docker.push.registry>10.12.5.45:5000</docker.push.registry> + + <!-- for Distribution Management --> + <sitePath>/content/sites/site/org/onap/dmaap/dmaap-bc/${artifact.version}</sitePath> + </properties> + <description>Packaging Platform (DMaaP) Bus Controller API as a Docker container.</description> +</project> diff --git a/src/main/resources/docker-compose.yml b/dmaap-bc/src/main/resources/docker-compose.yml index 41bc473..41bc473 100644 --- a/src/main/resources/docker-compose.yml +++ b/dmaap-bc/src/main/resources/docker-compose.yml diff --git a/src/main/resources/docker-databus-controller.conf b/dmaap-bc/src/main/resources/docker-databus-controller.conf index 7214adf..7214adf 100644 --- a/src/main/resources/docker-databus-controller.conf +++ b/dmaap-bc/src/main/resources/docker-databus-controller.conf diff --git a/src/main/webapp/HelloJetty.html b/dmaap-bc/src/main/webapp/HelloJetty.html index 4d61636..4d61636 100644 --- a/src/main/webapp/HelloJetty.html +++ b/dmaap-bc/src/main/webapp/HelloJetty.html diff --git a/src/main/webapp/WEB-INF/log4j.xml b/dmaap-bc/src/main/webapp/WEB-INF/log4j.xml index 4e4d5e9..4e4d5e9 100644 --- a/src/main/webapp/WEB-INF/log4j.xml +++ b/dmaap-bc/src/main/webapp/WEB-INF/log4j.xml diff --git a/src/main/webapp/WEB-INF/web.xml b/dmaap-bc/src/main/webapp/WEB-INF/web.xml index 055fbf0..055fbf0 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/dmaap-bc/src/main/webapp/WEB-INF/web.xml diff --git a/src/main/webapp/index.jsp b/dmaap-bc/src/main/webapp/index.jsp index 3c20e06..3c20e06 100644 --- a/src/main/webapp/index.jsp +++ b/dmaap-bc/src/main/webapp/index.jsp diff --git a/dmaap-bc/version.properties b/dmaap-bc/version.properties new file mode 100644 index 0000000..67e2f3a --- /dev/null +++ b/dmaap-bc/version.properties @@ -0,0 +1,35 @@ +### +# ============LICENSE_START======================================================= +# org.onap.dmaap +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END============================================ +# =================================================================== +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +### + +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=1 +minor=1 +patch=1 +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT @@ -1,386 +1,69 @@ -<?xml version="1.0"?> -<!-- - ============LICENSE_START========================================== - org.onap.dmaap - =================================================================== - Copyright © 2018 AT&T Intellectual Property. All rights reserved. - =================================================================== - 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. - ============LICENSE_END============================================ - ECOMP is a trademark and service mark of AT&T Intellectual Property. ---> -<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/maven-v4_0_0.xsd"> +<!--* ============LICENSE_START==================================================== + * =========================================================================== + * org.onap.aaf + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =========================================================================== + * 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. + * ============LICENSE_END==================================================== + * --> + <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>org.onap.dmaap.buscontroller</groupId> - <artifactId>buscontroller</artifactId> - <version>${artifact.version}</version> + <groupId>org.onap.dmaap</groupId> + <artifactId>parent</artifactId> + <version>1.1.0-SNAPSHOT</version> <name>dmaap-buscontroller</name> + <packaging>pom</packaging> + <parent> - <groupId>org.onap.oparent</groupId> - <artifactId>oparent</artifactId> - <version>1.2.2</version> - <relativePath/> + <groupId>org.onap.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.2.2</version> </parent> - <build> - <finalName>buscontroller</finalName> - - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-no-snapshots</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireReleaseDeps> - <message>No Snapshots Allowed!</message> - <excludes> - <exclude>org.onap.dmaap.dbcapi:dbcapi</exclude> - <exclude>org.onap.aaf.authz:aaf-cadi-client</exclude> - <exclude>org.onap.aaf.authz:aaf-misc-env</exclude> - <exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude> - <exclude>org.onap.aaf.authz:aaf-auth-client</exclude> - <exclude>org.onap.aaf.authz:aaf-cadi-core</exclude> - <exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude> - </excludes> - </requireReleaseDeps> - </rules> - <fail>true</fail> - </configuration> - </execution> - </executions> - </plugin> - - <!-- Package an Uber jar --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>2.4.3</version> - <executions> - <!-- Run shade goal on package phase --> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <!-- this filter section is needed to avoid runtime error: - java.lang.SecurityException: Invalid signature file digest for Manifest main attributes - suggestion found at: https://stackoverflow.com/q/999489 - --> - <filters> - <filter> - <artifact>*:*</artifact> - <excludes> - <exclude>META-INF/*.SF</exclude> - <exclude>META-INF/*.DSA</exclude> - <exclude>META-INF/*.RSA</exclude> - </excludes> - </filter> - </filters> - <transformers> - <!-- NOTE: Need the following transformer else gets "Could not resolve type id 'https' into a subtype" error - Solution found from here: - http://stackoverflow.com/questions/27543060/why-does-dropwizard-configuration-is-not-working - Some more context here: - https://github.com/dropwizard/dropwizard/issues/455 --> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <!-- add Main-Class to manifest file --> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.onap.dmaap.dbcapi.server.Main</mainClass> - </transformer> - </transformers> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <serverId>ecomp-staging</serverId> - <nexusUrl>${nexusproxy}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - </configuration> - </plugin> - - <!-- for Distribution management --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.10</version> - </dependency> - </dependencies> - </plugin> + <properties> + <multiproject.basedir>${basedir}</multiproject.basedir> + <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version> + <skip.docker.build>true</skip.docker.build> + <skip.docker.tag>true</skip.docker.tag> + <skip.docker.push>true</skip.docker.push> + </properties> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <versionRange>[2.10,)</versionRange> - <phase>install</phase> - <goals> - <goal>copy-dependencies</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> +<!--- <profiles> <profile> <id>docker</id> +--> <build> <plugins> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>1.0.0</version> - <configuration> - <baseImage>java:openjdk-8-jre</baseImage> - <imageName>${onap.nexus.dockerregistry.daily}/${docker.image}</imageName> - <entryPoint>["./bin/dmaapbc", "deploy"]</entryPoint> - <serverId>${onap.nexus.dockerregistry.daily}</serverId> - <imageTags> - <imageTag>${artifact.version}</imageTag> - <imageTag>latest</imageTag> - </imageTags> - <volumes> - <volume>/opt/app/dmaapbc/log</volume> - </volumes> - <forceTags>true</forceTags> - <user>root</user> - <resources> - <resource> - <targetPath>/opt/app/dmaapbc/lib</targetPath> - <directory>target</directory> - <include>buscontroller.jar</include> - </resource> - <resource> - <targetPath>/opt/app/dmaapbc/etc</targetPath> - <directory>misc</directory> - <include>LocalKey</include> - <include>logback.xml</include> - <include>org.onap.dmaap-bc.trust.jks</include> - <include>dbc-api.jks</include> - </resource> - <resource> - <targetPath>/opt/app/dmaapbc/etc</targetPath> - <directory>.</directory> - <include>version.properties</include> - </resource> - <resource> - <targetPath>/opt/app/dmaapbc/misc</targetPath> - <directory>misc</directory> - <include>opensource.env</include> - <include>cert-client-init.sh</include> - <include>*.tmpl</include> - </resource> - <resource> - <targetPath>/opt/app/dmaapbc/bin</targetPath> - <directory>misc</directory> - <include>dmaapbc</include> - <include>doaction</include> - </resource> - </resources> - <runs> - <run>mv /opt/app/dmaapbc/etc/dbc-api.jks /opt/app/dmaapbc/etc/keystore</run> - <run>chmod 600 /opt/app/dmaapbc/etc/keystore</run> - <run>chmod 600 /opt/app/dmaapbc/etc/org.onap.dmaap-bc.trust.jks</run> - <run>chmod +x /opt/app/dmaapbc/misc/cert-client-init.sh</run> - <run>chmod +x /opt/app/dmaapbc/bin/*</run> - <run>mkdir /opt/app/dmaapbc/logs</run> - <run>mkdir /opt/app/dmaapbc/www</run> - <run>mkdir /opt/app/dmaapbc/www/doc</run> - </runs> - <workdir>/opt/app/dmaapbc</workdir> - </configuration> - </plugin> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>${docker.maven.plugin.version}</version> + <configuration> + <skipDockerBuild>${skip.docker.build}</skipDockerBuild> + </configuration> + </plugin> </plugins> </build> +<!--- </profile> </profiles> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.glassfish.jersey</groupId> - <artifactId>jersey-bom</artifactId> - <version>${jersey.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-core</artifactId> - <version>${swagger.version}</version> - </dependency> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-jersey2-jaxrs</artifactId> - <version>${swagger.version}</version> - </dependency> - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-annotations</artifactId> - <version>${swagger.version}</version> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - <!-- use the following artifactId if you don't need servlet 2.x compatibility --> - <!-- artifactId>jersey-container-servlet</artifactId --> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-moxy</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>${jettyVersion}</version> - </dependency> - <dependency> - <groupId>org.onap.aaf.authz</groupId> - <artifactId>aaf-cadi-aaf</artifactId> - <version>2.1.7</version> - <classifier>full</classifier> - </dependency> - - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>${jettyVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlets</artifactId> - <version>${jettyVersion}</version> - <scope>compile</scope> - </dependency> - <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple --> - <dependency> - <groupId>com.googlecode.json-simple</groupId> - <artifactId>json-simple</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.11</version> - </dependency> - <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql --> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>42.2.5</version> - </dependency> - - <dependency> - <groupId>org.onap.dmaap.dbcapi</groupId> - <artifactId>dbcapi</artifactId> - <version>1.0.21-SNAPSHOT</version> - </dependency> - </dependencies> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.4</version> - <configuration> - <failOnError>false</failOnError> - <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet> - <docletArtifact> - <groupId>org.umlgraph</groupId> - <artifactId>umlgraph</artifactId> - <version>5.6</version> - </docletArtifact> - <additionalparam>-views</additionalparam> - <useStandardDocletOptions>true</useStandardDocletOptions> - </configuration> - </plugin> - </plugins> - </reporting> - - <distributionManagement> - <site> - <id>ecomp-site</id> - <url>dav:${nexusproxy}${sitePath}</url> - </site> - </distributionManagement> - <properties> - <jersey.version>2.16</jersey.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <jettyVersion>9.4.12.RC2</jettyVersion> - <eelf.version>1.0.0</eelf.version> - <swagger.version>1.5.19</swagger.version> - <artifact.version>1.0.26</artifact.version> - <!-- SONAR --> - <jacoco.version>0.7.7.201606060606</jacoco.version> - <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> - <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> - <!-- Default Sonar configuration --> - <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.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**,**/pax/**</sonar.exclusions> - - <!-- docker image --> - <docker.image>onap/dmaap/buscontroller</docker.image> - - <nexusproxy>https://nexus.onap.org</nexusproxy> - <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> +--> - <!-- for Distribution Management --> - <sitePath>/content/sites/site/org/onap/dmaap/buscontroller/${artifact.version}</sitePath> - </properties> - <description>Packaging Platform (DMaaP) Bus Controller API as a Docker container.</description> + <modules> + <module>dmaap-bc</module> + <module>dbc-client</module> + </modules> </project> |