From c96258d1b6e58f7add9f146af9fa01203f78dcd6 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Fri, 16 Jan 2026 14:16:55 +0100
Subject: [PATCH 1/2] chore: Update druid-opa-authorizer for 26.3

---
 .github/workflows/maven.yml   |  2 +-
 .github/workflows/release.yml |  2 +-
 CHANGELOG.md                  |  5 +++-
 README.md                     |  8 ++---
 pom.xml                       | 55 ++++++++++++++++++-----------------
 5 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b7f06ae..db6f77b 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-33.0.0, java: '17'}
           - {druid: druid-34.0.0, java: '17'}
+          - {druid: druid-35.0.1, java: '21'}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0564601..cd12810 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,8 +10,8 @@ on:
         type: choice
         options:
           - druid-30.0.1
-          - druid-33.0.0
           - druid-34.0.0
+          - druid-35.0.1
       stackable-version:
         description: 'The stackable "patch" version to use for this release (e.g., "0").'
         required: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7295878..704890d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,13 +4,16 @@
 
 ### Added
 
-- Add support for Druid 34.0.0 ([#134]).
+- Add support for Druid 35.0.1 ([#xxx]).
+- Add support for Druid 34.0.0 (deprecated) ([#134], [#xxx]).
 
 ### Removed
 
+- Remove support for Druid 33.0.0 ([#xxx]).
 - Remove support for Druid 31.0.1 ([#134]).
 
 [#134]: https://github.com/stackabletech/druid-opa-authorizer/pull/134
+[#xxx]: https://github.com/stackabletech/druid-opa-authorizer/pull/xxx
 
 ## [0.7.0] - 2025-05-31
 
diff --git a/README.md b/README.md
index 8314939..c03eeb2 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
-- 33.0.0
-- 34.0.0
+- 30.0.1 (LTS)
+- 34.0.0 (Deprecated)
+- 35.0.1
 
 ## Building
 
 This repository uses Maven and requires at least Java 11 to build:
 
-        mvn -P druid-34.0.0 clean package
+        mvn -P druid-35.0.1 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 96d66fb..5399198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@
             <banDuplicatePomDependencyVersions />
             <banDynamicVersions />
             <requireActiveProfile>
-              <profiles>druid-30.0.1,druid-33.0.0,druid-34.0.0</profiles>
+              <profiles>druid-30.0.1,druid-34.0.0,druid-35.0.1</profiles>
               <all>false</all>
             </requireActiveProfile>
             <requireJavaVersion>
@@ -315,6 +315,7 @@
   -->
   <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>
@@ -340,31 +341,7 @@
       </dependencies>
     </profile>
     <profile>
-      <id>druid-33.0.0</id>
-      <properties>
-        <java.version>17</java.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 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>
-        <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>
       <properties>
         <java.version>17</java.version>
@@ -401,6 +378,32 @@
         </dependencies>
       </dependencyManagement>
     </profile>
+    <profile>
+      <!-- Supported since SPD 26.3 -->
+      <id>druid-35.0.1</id>
+      <properties>
+        <java.version>21</java.version>
+        <druid.version>35.0.1</druid.version>
+        <guava.version>32.1.3-jre</guava.version>
+        <guice.version>5.1.0</guice.version>
+        <jackson.version>2.19.2</jackson.version>
+      </properties>
+      <!--
+        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>
   </profiles>
 
 </project>

From 5f528efc9aab792cfa9f19455f9a95662ef2e453 Mon Sep 17 00:00:00 2001
From: Techassi <git@techassi.dev>
Date: Mon, 19 Jan 2026 08:52:01 +0100
Subject: [PATCH 2/2] chore: Update changelog

---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 704890d..1c2e7f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +4,16 @@
 
 ### Added
 
-- Add support for Druid 35.0.1 ([#xxx]).
-- Add support for Druid 34.0.0 (deprecated) ([#134], [#xxx]).
+- Add support for Druid 35.0.1 ([#138]).
+- Add support for Druid 34.0.0 (deprecated) ([#134], [#138]).
 
 ### Removed
 
-- Remove support for Druid 33.0.0 ([#xxx]).
+- Remove support for Druid 33.0.0 ([#138]).
 - Remove support for Druid 31.0.1 ([#134]).
 
 [#134]: https://github.com/stackabletech/druid-opa-authorizer/pull/134
-[#xxx]: https://github.com/stackabletech/druid-opa-authorizer/pull/xxx
+[#138]: https://github.com/stackabletech/druid-opa-authorizer/pull/138
 
 ## [0.7.0] - 2025-05-31