From 677614bd181a6f026beb0de391635eb1ca4f9554 Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Tue, 16 Jun 2026 11:38:12 +0200
Subject: [PATCH 1/3] feat: Add Druid 37.0.0

Remove 34.0.0
---
 .github/workflows/maven.yml |  2 +-
 README.md                   |  8 ++--
 pom.xml                     | 95 +++++++++++++------------------------
 3 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index db6f77b..1c667ad 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,8 +21,8 @@ jobs:
       matrix:
         profile:
           - {druid: druid-30.0.1, java: '17'}
-          - {druid: druid-34.0.0, java: '17'}
           - {druid: druid-35.0.1, java: '21'}
+          - {druid: druid-37.0.0, java: '21'}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
diff --git a/README.md b/README.md
index c03eeb2..0b13cbb 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.1 (LTS)
-- 34.0.0 (Deprecated)
-- 35.0.1
+- 37.0.0 (LTS)
+- 35.0.1 (Deprecated)
+- 30.0.1 (Deprecated)
 
 ## Building
 
 This repository uses Maven and requires at least Java 11 to build:
 
-        mvn -P druid-35.0.1 clean package
+        mvn -P druid-37.0.0 clean package
 
 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.
diff --git a/pom.xml b/pom.xml
index c840f53..3f30574 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
             <banDuplicatePomDependencyVersions />
             <banDynamicVersions />
             <requireActiveProfile>
-              <profiles>druid-30.0.1,druid-34.0.0,druid-35.0.1</profiles>
+              <profiles>druid-37.0.0,druid-35.0.1,druid-30.0.1</profiles>
               <all>false</all>
             </requireActiveProfile>
             <requireJavaVersion>
@@ -316,71 +316,18 @@
   -->
   <profiles>
     <profile>
-      <!-- LTS version since SDP 25.3 (30.0.0 in 24.11)-->
-      <id>druid-30.0.1</id>
-      <properties>
-        <java.version>17</java.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 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>
-        <dependency>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-databind</artifactId>
-          <version>2.12.7.1</version>
-          <scope>provided</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-    <profile>
-      <!-- Deprecated in SDP 26.3 -->
-      <id>druid-34.0.0</id>
+      <!-- LTS version since SDP 26.7 -->
+      <id>druid-37.0.0</id>
       <properties>
-        <java.version>17</java.version>
-        <druid.version>34.0.0</druid.version>
+        <java.version>21</java.version>
+        <druid.version>37.0.0</druid.version>
         <guava.version>32.1.3-jre</guava.version>
-        <guice.version>5.1.0</guice.version>
-        <jackson.version>2.18.4</jackson.version>
+        <guice.version>6.0.0</guice.version>
+        <jackson.version>2.20.2</jackson.version>
       </properties>
-      <dependencies>
-        <!--
-        In druid-server 34.0.0 all the jackson dependencies are specified to be 2.18.4 with the exception of jackson-core which is at 2.18.4.1:
-        https://github.com/apache/druid/blob/druid-34.0.0/pom.xml#L103, so we override that here
-        -->
-        <dependency>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-core</artifactId>
-          <version>2.18.4.1</version>
-          <scope>provided</scope>
-        </dependency>
-      </dependencies>
-      <!--
-        We need to override the guice version using <dependencyManagement> here, otherwise maven chooses the highest
-        possible version in the range given by https://github.com/FasterXML/jackson-modules-base/blob/jackson-modules-base-2.18.4/guice/pom.xml#L30
-        which for some reason also wins in the conflict resolution, resulting in another version of the dependency than druid uses
-      -->
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>${guice.version}</version>
-            <scope>provided</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
     </profile>
     <profile>
-      <!-- Supported since SPD 26.3 -->
+      <!-- Deprecated in SDP 26.7 -->
       <id>druid-35.0.1</id>
       <properties>
         <java.version>21</java.version>
@@ -405,6 +352,32 @@
         </dependencies>
       </dependencyManagement>
     </profile>
+    <profile>
+      <!-- Deprecated in SDP 26.7 -->
+      <id>druid-30.0.1</id>
+      <properties>
+        <java.version>17</java.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 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>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <version>2.12.7.1</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+    </profile>
   </profiles>
 
 </project>

From 7eb674ef8b1c01d3840668a097cfb0b94d6719dd Mon Sep 17 00:00:00 2001
From: Nick Larsen <nick.larsen@stackable.tech>
Date: Tue, 16 Jun 2026 11:59:28 +0200
Subject: [PATCH 2/3] fix: jackson-annotations and guice versions

---
 pom.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3f30574..4eb81d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -325,6 +325,33 @@
         <guice.version>6.0.0</guice.version>
         <jackson.version>2.20.2</jackson.version>
       </properties>
+      <dependencies>
+        <!--
+          We need to set the jackson-annotations version here, because 2.20.2 doesn't exist.
+          See: https://central.sonatype.com/artifact/com.fasterxml.jackson.core/jackson-annotations/2.20/versions
+        -->
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+          <version>2.20</version>
+          <scope>provided</scope>
+        </dependency>
+      </dependencies>
+      <!--
+        We need to override the guice version using <dependencyManagement> here, otherwise maven chooses the highest
+        possible version in the range given by https://github.com/FasterXML/jackson-modules-base/blob/jackson-modules-base-2.18.4/guice/pom.xml#L30
+        which for some reason also wins in the conflict resolution, resulting in another version of the dependency than druid uses
+      -->
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>${guice.version}</version>
+            <scope>provided</scope>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
     </profile>
     <profile>
       <!-- Deprecated in SDP 26.7 -->

From 9cfc2d04af49904969ba0caf4040a13d2d537a20 Mon Sep 17 00:00:00 2001
From: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
Date: Thu, 18 Jun 2026 17:06:23 +0200
Subject: [PATCH 3/3] Apply suggestions from code review

Co-authored-by: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
---
 README.md | 8 ++++----
 pom.xml   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0b13cbb..5df3333 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,13 @@ An Apache Druid extension to request policy decisions from [Open Policy Agent](h
 
 This project was tested against these Druid versions:
 
-- 37.0.0 (LTS)
-- 35.0.1 (Deprecated)
-- 30.0.1 (Deprecated)
+- 37.0.0
+- 35.0.1
+- 30.0.1
 
 ## Building
 
-This repository uses Maven and requires at least Java 11 to build:
+This repository uses Maven and requires at least Java 17/21 (depending on the Druid version) to build:
 
         mvn -P druid-37.0.0 clean package
 
diff --git a/pom.xml b/pom.xml
index 4eb81d5..1cff1d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -339,7 +339,7 @@
       </dependencies>
       <!--
         We need to override the guice version using <dependencyManagement> here, otherwise maven chooses the highest
-        possible version in the range given by https://github.com/FasterXML/jackson-modules-base/blob/jackson-modules-base-2.18.4/guice/pom.xml#L30
+        possible version in the range given by https://github.com/FasterXML/jackson-modules-base/blob/jackson-modules-base-2.20.2/guice/pom.xml#L30
         which for some reason also wins in the conflict resolution, resulting in another version of the dependency than druid uses
       -->
       <dependencyManagement>