summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2019-03-22 18:29:24 +0000
committerdglFromAtt <dgl@research.att.com>2019-03-22 18:46:43 +0000
commitff7ac524776b850b0054026566d4d1026067896d (patch)
tree924a6f5bba0a4bb5f0f838b2159c73582675a4f8
parent076d12181a51bebe7e2cbb1a9e9fef38e8006cfe (diff)
Copy Dublin SSL artifacts to container
Change-Id: Ia0fb6b8e216c151887b765edacfb7fcae23552b8 Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-1123 Signed-off-by: dglFromAtt <dgl@research.att.com> patchset2: updates the pom to copy the artifacts into etc Signed-off-by: dglFromAtt <dgl@research.att.com> Change-Id: Ia0fb6b8e216c151887b765edacfb7fcae23552b8
-rw-r--r--dmaap-bc/pom.xml13
-rw-r--r--dmaap-bc/src/main/resources/Dockerfile2
-rw-r--r--dmaap-bc/version.properties2
3 files changed, 12 insertions, 5 deletions
diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml
index f621291..0a77b8d 100644
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -191,8 +191,15 @@
<includes>
<include>LocalKey</include>
<include>logback.xml</include>
+ <include>org.onap.dmaap-bc.cred.props</include>
+ <include>org.onap.dmaap-bc.crontab.sh</include>
+ <include>org.onap.dmaap-bc.jks</include>
+ <include>org.onap.dmaap-bc.keyfile</include>
+ <include>org.onap.dmaap-bc.location.props</include>
+ <include>org.onap.dmaap-bc.p12</include>
+ <include>org.onap.dmaap-bc.props</include>
+ <include>org.onap.dmaap-bc.showpass</include>
<include>org.onap.dmaap-bc.trust.jks</include>
- <include>dbc-api.jks</include>
</includes>
</resource>
<resource>
@@ -417,7 +424,7 @@
<dependency>
<groupId>org.onap.dmaap.dbcapi</groupId>
<artifactId>dbcapi</artifactId>
- <version>1.0.23-SNAPSHOT</version>
+ <version>1.0.24-SNAPSHOT</version>
</dependency>
</dependencies>
<reporting>
@@ -455,7 +462,7 @@
<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>
+ <artifact.version>1.1.2</artifact.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/dmaap-bc/src/main/resources/Dockerfile b/dmaap-bc/src/main/resources/Dockerfile
index 16820e1..344e277 100644
--- a/dmaap-bc/src/main/resources/Dockerfile
+++ b/dmaap-bc/src/main/resources/Dockerfile
@@ -26,7 +26,7 @@ COPY /opt /opt
WORKDIR /opt/app/dmaapbc
-RUN mv etc/dbc-api.jks etc/keystore && \
+RUN mv etc/org.onap.dmaap-bc.jks etc/keystore && \
chmod 600 etc/keystore && \
chmod 600 etc/org.onap.dmaap-bc.trust.jks && \
chmod +x misc/cert-client-init.sh && \
diff --git a/dmaap-bc/version.properties b/dmaap-bc/version.properties
index 67e2f3a..85e1bd1 100644
--- a/dmaap-bc/version.properties
+++ b/dmaap-bc/version.properties
@@ -27,7 +27,7 @@
major=1
minor=1
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins