summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-02-04 17:12:46 -0500
committerJim Hahn <jrh3@att.com>2021-02-08 14:32:20 -0500
commit98d2ab1beb887658521d4ff42ba6b17a97f8ebae (patch)
tree5fe019d68317cdb4b0293ec1d92b803e43369eb7
parentcd9c3dbf9a8b3b2e4bbcf3a94e81b2a30edd4796 (diff)
Remove javax.persistence dependency
Running into a dependency collision between two eclipselink jars. Turns out, we don't actually need to include the javax.persistence dependency, so removed it altogether. Issue-ID: POLICY-3005 Change-Id: I5f09ddc27cdaa329b4604e6c715879d52335f870 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--integrity-audit/pom.xml6
-rw-r--r--integrity-monitor/pom.xml6
-rw-r--r--utils/pom.xml8
3 files changed, 6 insertions, 14 deletions
diff --git a/integrity-audit/pom.xml b/integrity-audit/pom.xml
index 2fbef8f3..ef6337f9 100644
--- a/integrity-audit/pom.xml
+++ b/integrity-audit/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
ONAP Policy Engine - Common Modules
================================================================================
- Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -59,10 +59,6 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
</dependency>
<dependency>
diff --git a/integrity-monitor/pom.xml b/integrity-monitor/pom.xml
index 8947e8ab..4711a1ca 100644
--- a/integrity-monitor/pom.xml
+++ b/integrity-monitor/pom.xml
@@ -2,7 +2,7 @@
============LICENSE_START=======================================================
ONAP Policy Engine - Common Modules
================================================================================
- Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -52,10 +52,6 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
<artifactId>eclipselink</artifactId>
</dependency>
<dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 36e570d1..004d643a 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -2,14 +2,14 @@
============LICENSE_START=======================================================
ONAP Policy Engine - Common Modules
================================================================================
- Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -85,7 +85,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
- <artifactId>javax.persistence</artifactId>
+ <artifactId>eclipselink</artifactId>
</dependency>
<dependency>
<groupId>com.worldturner.medeia</groupId>