From 12142469280ab15d3c38802e6be7d7676435c2b9 Mon Sep 17 00:00:00 2001
From: "adheli.tavares" <adheli.tavares@est.tech>
Date: Thu, 14 Mar 2024 21:48:25 +0000
Subject: Make drools-pdp work with drools and java versions compatible with
 current DRL rules files syntax.

Issue-ID: POLICY-4857
Change-Id: If4b385bdef865d07114b8ea0e69abb4589f3a97b
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---
 policy-core/pom.xml                                           | 11 ++++++-----
 .../java/org/onap/policy/drools/core/lock/AlwaysFailLock.java |  2 --
 .../org/onap/policy/drools/core/lock/AlwaysSuccessLock.java   |  2 --
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'policy-core')

diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 95e13945..35e64a76 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -5,7 +5,7 @@
   ================================================================================
   Copyright (C) 2017-2021, 2023 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019 Bell Canada.
-  Modifications Copyright (C) 2020,2022-2023 Nordix Foundation.
+  Modifications Copyright (C) 2020,2022-2024 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
-            <version>1.10.13</version>
+            <version>1.10.14</version>
         </dependency>
 
         <dependency>
@@ -115,17 +115,14 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
-            <version>4.0.3</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
-            <version>4.0.3</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>4.0.3</version>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
@@ -139,6 +136,10 @@
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2.external</groupId>
+            <artifactId>javax.inject</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/lock/AlwaysFailLock.java b/policy-core/src/main/java/org/onap/policy/drools/core/lock/AlwaysFailLock.java
index df0ac151..edb7f475 100644
--- a/policy-core/src/main/java/org/onap/policy/drools/core/lock/AlwaysFailLock.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/lock/AlwaysFailLock.java
@@ -21,7 +21,6 @@
 
 package org.onap.policy.drools.core.lock;
 
-import java.io.Serial;
 import lombok.NoArgsConstructor;
 
 /**
@@ -29,7 +28,6 @@ import lombok.NoArgsConstructor;
  */
 @NoArgsConstructor
 public class AlwaysFailLock extends LockImpl {
-    @Serial
     private static final long serialVersionUID = 1L;
 
     /**
diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/lock/AlwaysSuccessLock.java b/policy-core/src/main/java/org/onap/policy/drools/core/lock/AlwaysSuccessLock.java
index ced6c4c9..b4364515 100644
--- a/policy-core/src/main/java/org/onap/policy/drools/core/lock/AlwaysSuccessLock.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/core/lock/AlwaysSuccessLock.java
@@ -21,14 +21,12 @@
 
 package org.onap.policy.drools.core.lock;
 
-import java.io.Serial;
 import lombok.NonNull;
 
 /**
  * Lock implementation whose operations always succeed.
  */
 public class AlwaysSuccessLock extends LockImpl {
-    @Serial
     private static final long serialVersionUID = 1L;
 
     /**
-- 
cgit 1.2.3-korg