summaryrefslogtreecommitdiffstats
path: root/dependencies-bom
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-11-25 08:23:08 -0500
committerDan Timoney <dtimoney@att.com>2020-12-07 12:36:35 -0500
commita265d5be417269a7814e2e71e7dad7c0719f4770 (patch)
tree2d8c08f9718454b3dbad23f6f7a4f3da425f44ce /dependencies-bom
parentb044ec87f782ed741c814311e64664f0b64aa255 (diff)
Add missing dependencies to ccsdk oparent and fix versions
Some version declarations were missing from CCSDK oparent, which causes problems when moving repos to use CCSDK oparent pom instead of ODL-based parents. Also, update version properies to latest CCSDK master snapshot versions. Change-Id: Ia9222da0f8720f981cfcd98aaeaafc68aedbcb92 Issue-ID: CCSDK-3001 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'dependencies-bom')
-rw-r--r--dependencies-bom/pom.xml50
1 files changed, 49 insertions, 1 deletions
diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index f65cb8e4..a5e26f21 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -74,6 +74,16 @@
<version>2.4.0</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.2.11</version>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
@@ -106,6 +116,12 @@
<version>7.0</version>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
@@ -116,6 +132,17 @@
<version>2.1</version>
</dependency>
<dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.8</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>stax-api</artifactId>
+ <groupId>javax.xml.stream</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
@@ -158,6 +185,16 @@
<version>4.5.10</version>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>2.11.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>2.11.2</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>9.0.30</version>
@@ -165,7 +202,12 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -195,6 +237,12 @@
<version>2.4.4</version>
</dependency>
<dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-analytics</artifactId>
<version>1.6.5</version>