Code Review
/
policy
/
parent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert javax.persistence version
[policy/parent.git]
/
integration
/
pom.xml
diff --git
a/integration/pom.xml
b/integration/pom.xml
index
9cb5675
..
bf7ec9c
100644
(file)
--- a/
integration/pom.xml
+++ b/
integration/pom.xml
@@
-47,7
+47,6
@@
<version.swagger>1.6.0</version.swagger>
<version.javax.bind>2.3.1</version.javax.bind>
<version.javax.json>1.1.4</version.javax.json>
<version.swagger>1.6.0</version.swagger>
<version.javax.bind>2.3.1</version.javax.bind>
<version.javax.json>1.1.4</version.javax.json>
- <version.json>20190722</version.json>
<version.netty>4.1.48.Final</version.netty>
<jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
</properties>
<version.netty>4.1.48.Final</version.netty>
<jacoco.dataFile>${project.basedir}/../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
</properties>
@@
-182,14
+181,14
@@
<dependency>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
<dependency>
<groupId>com.google.re2j</groupId>
<artifactId>re2j</artifactId>
- <version>1.
3
</version>
+ <version>1.
4
</version>
</dependency>
<!-- MariaDB -->
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
</dependency>
<!-- MariaDB -->
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.
2.6
</version>
+ <version>2.
6.1
</version>
</dependency>
<!-- Swagger Jersey2 JAXRS -->
</dependency>
<!-- Swagger Jersey2 JAXRS -->
@@
-215,7
+214,7
@@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.1
1.1
</version>
+ <version>1.4.1
2
</version>
</dependency>
<!-- Eclipse Persistence API -->
</dependency>
<!-- Eclipse Persistence API -->
@@
-251,7
+250,7
@@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.1
1
</version>
+ <version>4.5.1
2
</version>
</dependency>
<!-- HttpComponents Core (blocking I/O) -->
</dependency>
<!-- HttpComponents Core (blocking I/O) -->
@@
-267,19
+266,29
@@
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
<artifactId>gson</artifactId>
<version>2.8.6</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20200518</version>
+ </dependency>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<!-- Lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.
4
</version>
+ <version>1.18.
12
</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <version>1.7.30</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>1.7.30</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@
-310,7
+319,13
@@
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
- <version>2.1.2</version>
+ <version>2.1.21</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Client library for Cambria event routing API -->
</dependency>
<!-- Client library for Cambria event routing API -->
@@
-336,7
+351,7
@@
<dependency>
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
<dependency>
<groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId>
- <version>1.
3.8
</version>
+ <version>1.
5.1
</version>
</dependency>
<!-- SnakeYAML -->
</dependency>
<!-- SnakeYAML -->
@@
-358,7
+373,7
@@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.
0.24
</version>
+ <version>3.
3.0
</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-429,7
+444,7
@@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.
197
</version>
+ <version>1.4.
200
</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
@@
-445,13
+460,13
@@
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-java</artifactId>
- <version>
5.4.0
</version>
+ <version>
6.1.2
</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-junit</artifactId>
- <version>
5.4.0
</version>
+ <version>
6.1.2
</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
@@
-459,7
+474,7
@@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.1
1
.1</version>
+ <version>3.1
6
.1</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
@@
-467,7
+482,7
@@
<dependency>
<groupId>com.openpojo</groupId>
<artifactId>openpojo</artifactId>
<dependency>
<groupId>com.openpojo</groupId>
<artifactId>openpojo</artifactId>
- <version>0.8.1
0
</version>
+ <version>0.8.1
3
</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-497,7
+512,7
@@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.
2.4
</version>
+ <version>3.
3.3
</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
@@
-505,7
+520,7
@@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>4.0.
2
</version>
+ <version>4.0.
3
</version>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>