summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2022-04-20 12:15:45 +0100
committerliamfallon <liam.fallon@est.tech>2022-04-21 17:58:12 +0100
commit88263d6c9831937a56f6c8f85739100d0e63b53a (patch)
tree22f4286536034206d9cf8a52bdb055140ab1e72d
parent41fc72569715ef1a86688325904d7833491c2891 (diff)
Update dependencies for security vulnerabilities
Use dependencies from oparent for httpcomponents add spring framework dependencies to dependency management Add github classgraph dependency Add Tomcat dependencies Issue-ID: POLICY-4070 Change-Id: I87db62c1df810feedf1ebc6efbc7808d89fecc83 Signed-off-by: liamfallon <liam.fallon@est.tech>
-rw-r--r--integration/pom.xml55
-rw-r--r--pom.xml4
2 files changed, 42 insertions, 17 deletions
diff --git a/integration/pom.xml b/integration/pom.xml
index abd3751c..32d5a766 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -371,13 +371,6 @@
<version>4.0.1</version>
</dependency>
- <!-- HttpComponents Client -->
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.13</version>
- </dependency>
-
<!-- HttpComponents Core (blocking I/O) -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -669,13 +662,6 @@
<version>3.0.8</version>
</dependency>
- <!-- Tomcat -->
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${version.tomcat}</version>
- </dependency>
-
<!-- jaxws -->
<dependency>
<groupId>javax.xml.ws</groupId>
@@ -886,6 +872,21 @@
<artifactId>spring-boot-starter-security</artifactId>
<version>${version.springboot}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>${version.springboot}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+ <version>${version.springboot}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ <version>${version.springboot}</version>
+ </dependency>
<!-- Hibernate -->
<dependency>
@@ -893,11 +894,35 @@
<artifactId>hibernate-core</artifactId>
<version>${version.hibernate.core}</version>
</dependency>
+
+ <!-- Github -->
+ <dependency>
+ <groupId>io.github.classgraph</groupId>
+ <artifactId>classgraph</artifactId>
+ <version>4.8.146</version>
+ </dependency>
+
+ <!-- Tomcat -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>${version.tomcat}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>${version.tomcat}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>${version.tomcat}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
-
<scm>
<connection>scm:git:ssh://git.onap.org:29418/${project.groupId}</connection>
<developerConnection>scm:git:ssh://git.onap.org:29418/${project.groupId}</developerConnection>
diff --git a/pom.xml b/pom.xml
index 595019e5..2e1599f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>3.2.1</version>
+ <version>3.3.1-SNAPSHOT</version>
<relativePath />
</parent>
<groupId>org.onap.policy.parent</groupId>
@@ -33,7 +33,7 @@
<packaging>pom</packaging>
<properties>
- <oparent.version>3.2.1</oparent.version>
+ <oparent.version>3.3.1-SNAPSHOT</oparent.version>
</properties>
<modules>