diff options
| author |   dglFromAtt <dgl@research.att.com> | 2019-04-03 23:16:06 +0000 |
|---|---|---|
| committer | dglFromAtt <dgl@research.att.com> | 2019-04-03 23:16:15 +0000 |
| commit | a4aeefb08d2ed5fb10a94fe3df63910db7827d33 (patch) | |
| tree | f8c9f5db3d13dc34eafc1680d3bc0eeeb007165f /dmaap-bc/pom.xml | |
| parent | e6de2cef6c35390335df07f868d2484adc3949c3 (diff) | |
Add client cert PEM files for authenticated requests
Note also relocated AAF cert artifacts since they are used by
both docker images created in this repo.
Change-Id: I539c0062ab9bc573e610bc7669d78e9528e2aace
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1142
Diffstat (limited to 'dmaap-bc/pom.xml')
| -rw-r--r-- | dmaap-bc/pom.xml | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml index 24f9e42..8252249 100644 --- a/dmaap-bc/pom.xml +++ b/dmaap-bc/pom.xml @@ -187,10 +187,8 @@ </resource> <resource> <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath> - <directory>${basedir}/misc</directory> + <directory>${multiproject.basedir}/certs</directory> <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> @@ -203,6 +201,22 @@ </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> + <include>LocalKey</include> + <include>logback.xml</include> + </includes> + </resource> + <resource> <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath> <directory>${basedir}</directory> <includes> @@ -218,14 +232,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/bin</targetPath> <directory>${basedir}/misc</directory> <includes> @@ -463,7 +469,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.2</artifact.version> + <artifact.version>1.1.3</artifact.version> <!-- SONAR --> <jacoco.version>0.7.7.201606060606</jacoco.version> <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> |