From fe1c4796744261dc760680dc6e40e479d2015b3b Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@ericsson.com>
Date: Tue, 10 Jul 2018 19:23:11 +0300
Subject: Change JNR and DOM4J license versions

Change the JNR and DOM4J licenses to versions that are
approved by the Linux Foundataion.

Issue-ID: POLICY-905
Change-Id: I11fb2356bf90db27d16fe57ab70a910dac09459b
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
---
 .../plugins-executor-jruby/pom.xml                 | 22 ++++++++++++++++++++++
 .../plugins-persistence-jpa-hibernate/pom.xml      | 11 +++++++++++
 2 files changed, 33 insertions(+)

(limited to 'plugins')

diff --git a/plugins/plugins-executor/plugins-executor-jruby/pom.xml b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
index 901d30e9f..759cfb6b0 100644
--- a/plugins/plugins-executor/plugins-executor-jruby/pom.xml
+++ b/plugins/plugins-executor/plugins-executor-jruby/pom.xml
@@ -48,7 +48,29 @@
                     <groupId>org.jruby</groupId>
                     <artifactId>jruby-stdlib</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.github.jnr</groupId>
+                    <artifactId>jnr-posix:</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.jnr</groupId>
+                    <artifactId>jnr-posix:</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.jnr</groupId>
+                    <artifactId>jffi</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jnr-posix</artifactId>
+            <version>3.0.45</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jnr</groupId>
+            <artifactId>jffi</artifactId>
+            <version>1.2.10</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml
index 29c0519e8..f20a06c1f 100644
--- a/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml
+++ b/plugins/plugins-persistence/plugins-persistence-jpa/plugins-persistence-jpa-hibernate/pom.xml
@@ -39,6 +39,12 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>dom4j</groupId>
+                    <artifactId>dom4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -50,5 +56,10 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
-- 
cgit 1.2.3-korg