diff options
| -rw-r--r-- | dbc-client/pom.xml | 51 | ||||
| -rw-r--r-- | dmaap-bc/pom.xml | 105 | ||||
| -rw-r--r-- | dmaap-bc/src/main/resources/Dockerfile | 7 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
5 files changed, 103 insertions, 64 deletions
diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml index 6fad50e..30940bb 100644 --- a/dbc-client/pom.xml +++ b/dbc-client/pom.xml @@ -30,6 +30,20 @@ <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> + <description>Packaging Platform (DMaaP) HTTP Client for Bus Controller Provisioning.</description> + <properties> + <multiproject.basedir>${basedir}/..</multiproject.basedir> + <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- 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/${revision}</sitePath> + <timestamp>${maven.build.timestamp}</timestamp> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + </properties> <build> <finalName>dbc-client</finalName> <plugins> @@ -109,9 +123,9 @@ <include>org.onap.dmaap-bc.props</include> <include>org.onap.dmaap-bc.showpass</include> <include>org.onap.dmaap-bc.trust.jks</include> - <include>ca.pem</include> + <include>ca.pem</include> <include>client.pem</include> - <include>key.pem</include> + <include>key.pem</include> </includes> </resource> @@ -245,37 +259,4 @@ </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> - <!-- 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/${revision}</sitePath> - - <timestamp>${maven.build.timestamp}</timestamp> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - - </properties> - <description>Packaging Platform (DMaaP) HTTP Client for Bus Controller Provisioning.</description> </project> diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml index b191825..ded2cc2 100644 --- a/dmaap-bc/pom.xml +++ b/dmaap-bc/pom.xml @@ -176,14 +176,6 @@ </includes> </resource> <resource> - <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/misc</targetPath> - <directory>${multiproject.basedir}/misc</directory> - <includes> - <include>cert-client-init.sh</include> - <include>aaf-ca.crt</include> - </includes> - </resource> - <resource> <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath> <directory>${basedir}/misc</directory> <includes> @@ -332,6 +324,37 @@ </dependencyManagement> <dependencies> <dependency> + <groupId>org.onap.aaf.authz</groupId> + <artifactId>aaf-cadi-aaf</artifactId> + <version>2.1.7</version> + <classifier>full</classifier> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + <version>2.9.5</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-yaml</artifactId> + <version>2.9.5</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + <version>1.2.3</version> + </dependency> + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>1.2.3</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>24.1.1-jre</version> + </dependency> + <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-core</artifactId> <version>${swagger.version}</version> @@ -373,17 +396,6 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</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> @@ -414,7 +426,60 @@ <dependency> <groupId>org.onap.dmaap.dbcapi</groupId> <artifactId>dbcapi</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>com.att.eelf</groupId> + <artifactId>eelf-core</artifactId> + <version>${eelf.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.22</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> + <!-- use this if compatibility issues with jetty artifactId: + <artifactId>jersey-test-framework-provider-jetty</artifactId> + <version>${jersey.version}</version> + --> + <artifactId>jersey-test-framework-provider-jdk-http</artifactId> + <version>2.29.1</version> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.inject</groupId> + <artifactId>jersey-hk2</artifactId> + <version>2.29.1</version> + </dependency> + <dependency> + <!-- use 2.3.1 to avoid this issue: https://github.com/eclipse-ee4j/jaxb-ri/issues/1222 --> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + <version>1.2.0</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>pl.pragmatists</groupId> + <artifactId>JUnitParams</artifactId> + <version>1.1.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M3</version> </dependency> </dependencies> <reporting> diff --git a/dmaap-bc/src/main/resources/Dockerfile b/dmaap-bc/src/main/resources/Dockerfile index fef7fae..0f9e6a6 100644 --- a/dmaap-bc/src/main/resources/Dockerfile +++ b/dmaap-bc/src/main/resources/Dockerfile @@ -36,13 +36,6 @@ RUN apt-get update && \ procps \ bash -# Install AAF CA certificate -RUN apt install ca-certificates -RUN mkdir -p /usr/local/share/ca-certificates && \ - mv misc/aaf-ca.crt /usr/local/share/ca-certificates/aaf-ca.crt -RUN update-ca-certificates - - #prepare certificate location for cadi RUN mkdir -p /opt/app/osaaf @@ -33,7 +33,7 @@ </parent> <properties> - <revision>2.0.5-SNAPSHOT</revision> + <revision>2.0.6-SNAPSHOT</revision> <multiproject.basedir>${basedir}</multiproject.basedir> <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version> <skip.docker.build>false</skip.docker.build> diff --git a/version.properties b/version.properties index 14d3d8f..6f46efa 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=2 minor=0 -patch=5 +patch=6 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins |