<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.2</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
<build>
<requireReleaseDeps>
<message>No Snapshots Allowed!</message>
<excludes>
+<!-- for example, these might be needed...
<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-auth-client</exclude>
<exclude>org.onap.aaf.authz:aaf-cadi-core</exclude>
<exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude>
+-->
</excludes>
</requireReleaseDeps>
</rules>
</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>
<includes>
<include>Dockerfile</include>
</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>
<includes>
<include>LocalKey</include>
<include>logback.xml</include>
- <include>org.onap.dmaap-bc.trust.jks</include>
- <include>dbc-api.jks</include>
</includes>
</resource>
+
<resource>
<targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
- <directory>${basedir}</directory>
+ <directory>${multiproject.basedir}</directory>
<includes>
<include>version.properties</include>
</includes>
<include>opensource.env</include>
<include>*.tmpl</include>
</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>
- </includes>
</resource>
<resource>
<targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/bin</targetPath>
<directory>${basedir}/misc</directory>
<includes>
<include>dmaapbc</include>
- <include>doaction</include>
</includes>
</resource>
</resources>
<artifactId>jetty-server</artifactId>
<version>${jettyVersion}</version>
</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>
<dependency>
<groupId>org.onap.dmaap.dbcapi</groupId>
<artifactId>dbcapi</artifactId>
- <version>1.0.23-SNAPSHOT</version>
+ <version>2.0.2</version>
</dependency>
</dependencies>
<reporting>
<properties>
<multiproject.basedir>${basedir}/..</multiproject.basedir>
<docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
- <jersey.version>2.16</jersey.version>
+ <jersey.version>2.29</jersey.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jettyVersion>9.4.12.RC2</jettyVersion>
+ <jettyVersion>9.4.24.v20191120</jettyVersion>
<eelf.version>1.0.0</eelf.version>
<swagger.version>1.5.19</swagger.version>
- <artifact.version>1.1.1</artifact.version>
+ <artifact.version>2.0.4-SNAPSHOT</artifact.version>
+ <timestamp>${maven.build.timestamp}</timestamp>
+ <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>