Code Review
/
ccsdk
/
parent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update mariadb-java-client
[ccsdk/parent.git]
/
dependencies-bom
/
pom.xml
diff --git
a/dependencies-bom/pom.xml
b/dependencies-bom/pom.xml
index
825d2c4
..
86c60c3
100644
(file)
--- a/
dependencies-bom/pom.xml
+++ b/
dependencies-bom/pom.xml
@@
-4,7
+4,7
@@
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>dependencies-bom</artifactId>
- <version>2.
1.2
-SNAPSHOT</version>
+ <version>2.
2.0
-SNAPSHOT</version>
<packaging>pom</packaging>
<distributionManagement>
<packaging>pom</packaging>
<distributionManagement>
@@
-44,6
+44,7
@@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
+ <!-- ODL Aluminum has 2.10.5 -->
<version>2.11.4</version>
<type>pom</type>
<scope>import</scope>
<version>2.11.4</version>
<type>pom</type>
<scope>import</scope>
@@
-120,10
+121,16
@@
<artifactId>javaee-api</artifactId>
<version>7.0</version>
</dependency>
<artifactId>javaee-api</artifactId>
<version>7.0</version>
</dependency>
+ <!-- Below provides javax.annotations -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>3.0.1</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
- <version>1.3</version>
+ <version>1.3
.1
</version>
<optional>true</optional>
</dependency>
<dependency>
<optional>true</optional>
</dependency>
<dependency>
@@
-134,19
+141,31
@@
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
+ </dependency>
+ <!-- Below provides javax.jws -->
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-ri</artifactId>
+ <version>2.3.4</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.
2.8
</version>
+ <version>2.
3.1
</version>
<exclusions>
<exclusion>
<exclusions>
<exclusion>
- <groupId>
javax.xml.stream
</groupId>
- <artifactId>
stax-api
</artifactId>
+ <groupId>
*
</groupId>
+ <artifactId>
*
</artifactId>
</exclusion>
</exclusions>
</dependency>
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@
-156,7
+175,7
@@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
- <version>4.
7.2
</version>
+ <version>4.
8-1
</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@
-166,12
+185,12
@@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.
8.
1</version>
+ <version>3.
1
1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.
6
</version>
+ <version>1.
9
</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@
-227,6
+246,7
@@
<dependency>
<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
<dependency>
<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>
+ <!-- ODL has 2.27 -->
<version>2.29.1</version>
<type>pom</type>
<scope>import</scope>
<version>2.29.1</version>
<type>pom</type>
<scope>import</scope>
@@
-244,17
+264,19
@@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
+ <!-- ODL has 20131018 -->
<version>20201115</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>20201115</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
+ <!-- ODL has 1.8.3 -->
<version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>1.12.1</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.
4.4
</version>
+ <version>2.
7.3
</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@
-262,20
+284,15
@@
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.onap.logging-analytics</groupId>
- <artifactId>logging-analytics</artifactId>
- <version>1.6.6</version>
- </dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-base</artifactId>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-filter-base</artifactId>
- <version>1.6.
6
</version>
+ <version>1.6.
9
</version>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.onap.logging-analytics</groupId>
<artifactId>logging-slf4j</artifactId>
- <version>1.6.
6
</version>
+ <version>1.6.
9
</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@
-291,6
+308,7
@@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <!-- ODL has 1.7.29 -->
<version>1.7.30</version>
</dependency>
<dependency>
<version>1.7.30</version>
</dependency>
<dependency>
@@
-303,6
+321,11
@@
<artifactId>testng</artifactId>
<version>6.14.3</version>
</dependency>
<artifactId>testng</artifactId>
<version>6.14.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>1.7.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
</dependencies>
</dependencyManagement>
<dependencies>