aboutsummaryrefslogtreecommitdiffstats
path: root/dmaap-bc
diff options
context:
space:
mode:
Diffstat (limited to 'dmaap-bc')
-rw-r--r--dmaap-bc/pom.xml105
-rw-r--r--dmaap-bc/src/main/resources/Dockerfile7
2 files changed, 85 insertions, 27 deletions
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