From b924c3b1b12ca3d8e78a6ea4ed92f4bfa92ca0f6 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Thu, 15 May 2025 10:36:40 +0200
Subject: [PATCH 1/3] feat: Add druid 33.0.0, remove 30.0.0

---
 .github/workflows/maven.yml   |  2 +-
 .github/workflows/release.yml |  2 +-
 README.md                     |  4 ++--
 pom.xml                       | 40 +++++++++++++++++++++++++----------
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c1eeb68..6d77bff 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,9 +20,9 @@ jobs:
     strategy:
       matrix:
         profile:
-          - {druid: druid-30.0.0, java: '17'}
           - {druid: druid-30.0.1, java: '17'}
           - {druid: druid-31.0.1, java: '17'}
+          - {druid: druid-33.0.0, java: '17'}
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1b61797..9b2bb8b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,9 +9,9 @@ on:
         required: true
         type: choice
         options:
-          - druid-30.0.0
           - druid-30.0.1
           - druid-31.0.1
+          - druid-33.0.0
       stackable-version:
         description: 'The stackable "patch" version to use for this release (e.g., "0").'
         required: true
diff --git a/README.md b/README.md
index d0a3ad1..4fbf39c 100644
--- a/README.md
+++ b/README.md
@@ -6,15 +6,15 @@ An Apache Druid extension to request policy decisions from [Open Policy Agent](h
 
 This project was tested against these Druid versions:
 
-- 30.0.0
 - 30.0.1
 - 31.0.1
+- 33.0.0
 
 ## Building
 
 This repository uses Maven and requires at least Java 11 to build:
 
-        mvn -P druid-31.0.1 clean package
+        mvn -P druid-33.0.0 clean package
 
 Please check that the Druid version you are building for is supported and adopt the profile accordingly.
 The result of this is a JAR file in the `target` directory.
diff --git a/pom.xml b/pom.xml
index 556b8b7..1301949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -159,7 +159,7 @@
             <banDuplicatePomDependencyVersions />
             <banDynamicVersions />
             <requireActiveProfile>
-              <profiles>druid-30.0.0,druid-30.0.1,druid-31.0.1</profiles>
+              <profiles>druid-30.0.1,druid-31.0.1,druid-33.0.0</profiles>
               <all>false</all>
             </requireActiveProfile>
             <requireJavaVersion>
@@ -311,13 +311,19 @@
   -->
   <profiles>
     <profile>
-      <id>druid-30.0.0</id>
+      <id>druid-30.0.1</id>
       <properties>
         <java.version>17</java.version>
-        <druid.version>30.0.0</druid.version>
+        <druid.version>30.0.1</druid.version>
         <guava.version>32.0.1-jre</guava.version>
         <guice.version>4.1.0</guice.version>
-        <!-- jackson.version in 30.0.0 is actually specified as 2.12.7.20221012 but according to the release notes https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12#micro-patches that is "only" the BOM which specifies almost all dependencies to be 2.12.7 with the exception of jackson-databind which is at 2.12.7.1: https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-bom/2.12.7.20221012/jackson-bom-2.12.7.20221012.pom so we override that here -->
+        <!--
+        jackson.version in 33.0.1 is actually specified as 2.12.7.20221012 but according to the release notes
+        https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12#micro-patches that is "only" the BOM which
+        specifies almost all dependencies to be 2.12.7 with the exception of jackson-databind which is at 2.12.7.1:
+        https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-bom/2.12.7.20221012/jackson-bom-2.12.7.20221012.pom
+        so we override that here
+        -->
         <jackson.version>2.12.7</jackson.version>
       </properties>
       <dependencies>
@@ -336,13 +342,20 @@
       </dependencies>
     </profile>
     <profile>
-      <id>druid-30.0.1</id>
+      <!-- LTS version as of 25.3 -->
+      <id>druid-31.0.1</id>
       <properties>
         <java.version>17</java.version>
-        <druid.version>30.0.1</druid.version>
+        <druid.version>31.0.1</druid.version>
         <guava.version>32.0.1-jre</guava.version>
         <guice.version>4.1.0</guice.version>
-        <!-- jackson.version in 30.0.1 is actually specified as 2.12.7.20221012 but according to the release notes https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12#micro-patches that is "only" the BOM which specifies almost all dependencies to be 2.12.7 with the exception of jackson-databind which is at 2.12.7.1: https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-bom/2.12.7.20221012/jackson-bom-2.12.7.20221012.pom so we override that here -->
+        <!--
+        jackson.version in 31.0.1 is actually specified as 2.12.7.20221012 but according to the release notes
+        https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12#micro-patches that is "only" the BOM which
+        specifies almost all dependencies to be 2.12.7 with the exception of jackson-databind which is at 2.12.7.1:
+        https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-bom/2.12.7.20221012/jackson-bom-2.12.7.20221012.pom
+        so we override that here
+        -->
         <jackson.version>2.12.7</jackson.version>
       </properties>
       <dependencies>
@@ -361,14 +374,19 @@
       </dependencies>
     </profile>
     <profile>
-      <!-- LTS version as of 25.3 -->
-      <id>druid-31.0.1</id>
+      <id>druid-33.0.0</id>
       <properties>
         <java.version>17</java.version>
-        <druid.version>31.0.1</druid.version>
+        <druid.version>33.0.0</druid.version>
         <guava.version>32.0.1-jre</guava.version>
         <guice.version>4.1.0</guice.version>
-        <!-- jackson.version in 31.0.1 is actually specified as 2.12.7.20221012 but according to the release notes https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12#micro-patches that is "only" the BOM which specifies almost all dependencies to be 2.12.7 with the exception of jackson-databind which is at 2.12.7.1: https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-bom/2.12.7.20221012/jackson-bom-2.12.7.20221012.pom so we override that here -->
+        <!--
+        jackson.version in 33.0.0 is actually specified as 2.12.7.20221012 but according to the release notes
+        https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12#micro-patches that is "only" the BOM which
+        specifies almost all dependencies to be 2.12.7 with the exception of jackson-databind which is at 2.12.7.1:
+        https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-bom/2.12.7.20221012/jackson-bom-2.12.7.20221012.pom
+        so we override that here
+        -->
         <jackson.version>2.12.7</jackson.version>
       </properties>
       <dependencies>

From 0cd308257a6fca7f6e55a472b68c0ae92fb7c7c7 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Thu, 15 May 2025 10:44:26 +0200
Subject: [PATCH 2/3] chore: Update changelog

---
 CHANGELOG.md | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 122c69d..fe192a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,24 @@
 
 ## [Unreleased]
 
+### Added
+
+- Add support for Druid 30.0.1, 31.0.1, and 33.0.0 ([#110], [#112]).
+
 ### Changed
 
-- Added support for Druid 30.0.0 and removed support for Druid 27.0.0 ([#104]).
-- Removed support for Druid 28.0.1 ([#105]).
 - Update dependencies ([#106]).
-- Updated Maven plugin versions, added support for Druid 31.0.1 and 30.0.1, removed support for Druid 26.0.0 ([#110]).
+- Updated Maven plugin versions ([#110]).
+
+### Removed
+
+- Remove support for Druid 26.0.0, 27.0.0, 28.0.1, 30.0.0 ([#104], [#105], [#110], [#112]).
 
 [#104]: https://github.com/stackabletech/druid-opa-authorizer/pull/104
 [#105]: https://github.com/stackabletech/druid-opa-authorizer/pull/105
 [#106]: https://github.com/stackabletech/druid-opa-authorizer/pull/106
 [#110]: https://github.com/stackabletech/druid-opa-authorizer/pull/110
+[#112]: https://github.com/stackabletech/druid-opa-authorizer/pull/112
 
 ## [0.6.0] - 2024-03-19
 

From 7b269c536bc3bebcc66e2818b3403873d73c322a Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Thu, 15 May 2025 10:47:09 +0200
Subject: [PATCH 3/3] chore: Typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4fbf39c..ec72372 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This repository uses Maven and requires at least Java 11 to build:
 
         mvn -P druid-33.0.0 clean package
 
-Please check that the Druid version you are building for is supported and adopt the profile accordingly.
+Please check that the Druid version you are building for is supported and adapt the profile accordingly.
 The result of this is a JAR file in the `target` directory.
 
 ## Installing