summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-05-09 10:26:49 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-06-11 09:31:52 +0200
commite8fcf7c536a77381542dabc239a3e127c319e4a8 (patch)
tree9282f1adbd5ba332ecb9eb2739087e6b8edcbb3a
parent6d6ccec6604ea2cd672bb1c453d6d1f96e9c0518 (diff)
Update to use standalone pom
Update standalone containers dmaap-listener and ueb-listener to use standalone parent poms. This version contains some vulnerability fixes that are not possible to address in containers that install their own third-party library versions. Change-Id: I75a295b331190d87a38002924ccbdd985ca8f494 Issue-ID: CCSDK-1320 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
-rwxr-xr-xdmaap-listener/pom.xml36
-rwxr-xr-xueb-listener/pom.xml44
2 files changed, 32 insertions, 48 deletions
diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml
index 6c43c9c1..50012137 100755
--- a/dmaap-listener/pom.xml
+++ b/dmaap-listener/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
+ <artifactId>standalone-parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
@@ -17,21 +17,27 @@
<description>DMAAP Listener</description>
<properties>
- <sdc.client.version>1.2.0-SNAPSHOT</sdc.client.version>
- <fasterxml.jackson.version>2.9.4</fasterxml.jackson.version>
- <velocity.version>2.0</velocity.version>
<skip.SWM>true</skip.SWM>
<dmaap.listener.base>/opt/app/dmaap-listener</dmaap.listener.base>
- <dmaap.listener.version>1.1.5</dmaap.listener.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<build.number>${maven.build.timestamp}</build.number>
<SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
+
+ <ccsdk.sli.core.version>0.5.0-SNAPSHOT</ccsdk.sli.core.version>
<ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
</properties>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<!-- dmaapClient needs this version of this jar -->
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -46,61 +52,45 @@
<dependency>
<groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
<artifactId>dmaapClient</artifactId>
- <version>${dmaap.listener.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- <scope>compile</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
- <version>${velocity.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.vorburger.mariaDB4j</groupId>
<artifactId>mariaDB4j</artifactId>
- <version>2.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>dblib-provider</artifactId>
- <version>${sdnctl.dblib.version}</version>
</dependency>
</dependencies>
diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml
index 550cbfdd..f219f523 100755
--- a/ueb-listener/pom.xml
+++ b/ueb-listener/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
+ <artifactId>standalone-parent</artifactId>
<version>1.3.0-SNAPSHOT</version>
</parent>
@@ -17,48 +17,47 @@
<description>UEB Listener</description>
<properties>
- <sdc.client.version>1.3.0</sdc.client.version>
- <sdc.tosca.version>1.5.1</sdc.tosca.version>
- <!-- Use managed version of jackson
- <fasterxml.jackson.version>2.9.4</fasterxml.jackson.version>
- -->
<skip.SWM>true</skip.SWM>
<ueb.listener.base>/opt/app/ueb-listener</ueb.listener.base>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<build.number>${maven.build.timestamp}</build.number>
<SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
+ <ccsdk.sli.core.version>0.5.0-SNAPSHOT</ccsdk.sli.core.version>
<ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
</properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>sli-core-artifacts</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
+
<dependency>
<groupId>org.onap.sdc.sdc-distribution-client</groupId>
<artifactId>sdc-distribution-client</artifactId>
- <version>${sdc.client.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.onap.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
- <version>${sdc.tosca.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -71,31 +70,26 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.vorburger.mariaDB4j</groupId>
<artifactId>mariaDB4j</artifactId>
- <version>2.2.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>dblib-provider</artifactId>
- <version>${sdnctl.dblib.version}</version>
</dependency>
</dependencies>
@@ -111,8 +105,8 @@
<version>2.5.1</version>
<inherited>true</inherited>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>