aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-06-30 19:08:26 -0400
committerJim Hahn <jrh3@att.com>2020-07-01 10:02:16 -0400
commite7ba97a66db5c0a45626aff62f9a167f88da62c1 (patch)
tree8bd8d30937ed62dcd70fe26a7cfeed5c27c2a29c
parent21607022333b8d3917754d071d5e4c259308edef (diff)
Fix broken models build due to json upgrade
The json dependency was moved to policy-parent and the "version" property removed which broke the policy-models build. Removed the "version" from the pom. Also removed the jetty-security "version" from the pom, as it is no longer needed either. Also added asm dependency, because upgrade of openpojo version caused breakage in one of the TestPojos. Issue-ID: POLICY-2387 Change-Id: I3c2315b3cbea05de76b6dfcc289f9323af77745b Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--models-tosca/pom.xml7
-rw-r--r--pom.xml6
2 files changed, 7 insertions, 6 deletions
diff --git a/models-tosca/pom.xml b/models-tosca/pom.xml
index 2764662a2..ba9011d57 100644
--- a/models-tosca/pom.xml
+++ b/models-tosca/pom.xml
@@ -71,6 +71,13 @@
</dependency>
<dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>8.0.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index e6332db7e..24b742e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,6 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>9.4.30.v20200611</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -191,11 +190,6 @@
<artifactId>javax.json</artifactId>
<version>${version.javax.json}</version>
</dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${version.json}</version>
- </dependency>
</dependencies>
<dependencyManagement>