From e226e8ccfa361a9cb1beded92e79b9f0ab5add1a Mon Sep 17 00:00:00 2001
From: Giedrius Trumpickas <trumpyla@gmail.com>
Date: Mon, 17 Jul 2023 15:35:16 -0400
Subject: [PATCH 1/4] JDK 11 compatibility

---
 pom.xml            | 14 +++++++++++++-
 xacml-core/pom.xml |  8 ++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 329801f99..085ad4f80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,6 +139,18 @@
 				<artifactId>cglib-nodep</artifactId>
 				<version>2.2</version>
 			</dependency>
+			<dependency>
+				<groupId>jakarta.xml.bind</groupId>
+				<artifactId>jakarta.xml.bind-api</artifactId>
+				<version>2.3.3</version>
+				<scope>compile</scope>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.xml.bind</groupId>
+				<artifactId>jaxb-impl</artifactId>
+				<version>2.3.8</version>
+				<scope>runtime</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -167,7 +179,7 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<source>1.8</source>
-					<target>1.8</target>
+					<target>11</target>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/xacml-core/pom.xml b/xacml-core/pom.xml
index 77bc65cd5..796464c89 100644
--- a/xacml-core/pom.xml
+++ b/xacml-core/pom.xml
@@ -18,6 +18,14 @@
 			<groupId>cglib</groupId>
 			<artifactId>cglib-nodep</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

From b588e69d289da7fd35cf68f31abc0b3701b6b41d Mon Sep 17 00:00:00 2001
From: Giedrius Trumpickas <trumpyla@gmail.com>
Date: Mon, 17 Jul 2023 15:53:11 -0400
Subject: [PATCH 2/4] JDK 11

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 085ad4f80..9fe3ba66e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<source>1.8</source>
+					<source>11</source>
 					<target>11</target>
 				</configuration>
 			</plugin>

From adf206acb2e5530ce8687c224fc73857355b265a Mon Sep 17 00:00:00 2001
From: Giedrius Trumpickas <trumpyla@gmail.com>
Date: Mon, 17 Jul 2023 15:57:48 -0400
Subject: [PATCH 3/4] Fixed security issues

---
 pom.xml            | 2 +-
 xacml-json/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9fe3ba66e..294375e38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 		<slf4j.version>1.7.32</slf4j.version>
 		<logback.version>1.2.8</logback.version>
 		<easymock.version>3.1</easymock.version>
-		<guava.version>24.1.1-jre</guava.version>
+		<guava.version>32.0.0-jre</guava.version>
 		<xml.resolver.version>1.2</xml.resolver.version>
 		<yammer.metrics.version>3.0.2</yammer.metrics.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/xacml-json/pom.xml b/xacml-json/pom.xml
index 450c1dee2..a5d0bf2f2 100644
--- a/xacml-json/pom.xml
+++ b/xacml-json/pom.xml
@@ -18,7 +18,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.2.2</version>
+			<version>2.8.9</version>
 			<scope>compile</scope>
 		</dependency>
  	</dependencies>

From 0d93f65b716814867b45c6d947f8b6c9e71cc422 Mon Sep 17 00:00:00 2001
From: Giedrius Trumpickas <trumpyla@gmail.com>
Date: Mon, 17 Jul 2023 16:01:29 -0400
Subject: [PATCH 4/4] JDK 11

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 66b96e91e..aa2ee37a5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master, 1.3.x ]
+    branches: [ master, 1.5.x ]
 
 
 jobs:
@@ -20,10 +20,10 @@ jobs:
     - name: Check out
       uses: actions/checkout@v2
     - uses: ouzi-dev/commit-status-updater@v1.1.0
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: '11'
         distribution: 'adopt'
         cache: maven
     - name: Build with Maven