Skip to content

Commit 31a6568

Browse files
authored
chore: Update druid-opa-authorizer for 26.3 (#138)
* chore: Update druid-opa-authorizer for 26.3 * chore: Update changelog
1 parent c54e44d commit 31a6568

5 files changed

Lines changed: 39 additions & 33 deletions

File tree

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
matrix:
2222
profile:
2323
- {druid: druid-30.0.1, java: '17'}
24-
- {druid: druid-33.0.0, java: '17'}
2524
- {druid: druid-34.0.0, java: '17'}
25+
- {druid: druid-35.0.1, java: '21'}
2626
steps:
2727
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2828

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010
type: choice
1111
options:
1212
- druid-30.0.1
13-
- druid-33.0.0
1413
- druid-34.0.0
14+
- druid-35.0.1
1515
stackable-version:
1616
description: 'The stackable "patch" version to use for this release (e.g., "0").'
1717
required: true

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44

55
### Added
66

7-
- Add support for Druid 34.0.0 ([#134]).
7+
- Add support for Druid 35.0.1 ([#138]).
8+
- Add support for Druid 34.0.0 (deprecated) ([#134], [#138]).
89

910
### Removed
1011

12+
- Remove support for Druid 33.0.0 ([#138]).
1113
- Remove support for Druid 31.0.1 ([#134]).
1214

1315
[#134]: https://github.com/stackabletech/druid-opa-authorizer/pull/134
16+
[#138]: https://github.com/stackabletech/druid-opa-authorizer/pull/138
1417

1518
## [0.7.0] - 2025-05-31
1619

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ An Apache Druid extension to request policy decisions from [Open Policy Agent](h
66

77
This project was tested against these Druid versions:
88

9-
- 30.0.1
10-
- 33.0.0
11-
- 34.0.0
9+
- 30.0.1 (LTS)
10+
- 34.0.0 (Deprecated)
11+
- 35.0.1
1212

1313
## Building
1414

1515
This repository uses Maven and requires at least Java 11 to build:
1616

17-
mvn -P druid-34.0.0 clean package
17+
mvn -P druid-35.0.1 clean package
1818

1919
Please check that the Druid version you are building for is supported and adapt the profile accordingly.
2020
The result of this is a JAR file in the `target` directory.

pom.xml

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
<banDuplicatePomDependencyVersions />
164164
<banDynamicVersions />
165165
<requireActiveProfile>
166-
<profiles>druid-30.0.1,druid-33.0.0,druid-34.0.0</profiles>
166+
<profiles>druid-30.0.1,druid-34.0.0,druid-35.0.1</profiles>
167167
<all>false</all>
168168
</requireActiveProfile>
169169
<requireJavaVersion>
@@ -315,6 +315,7 @@
315315
-->
316316
<profiles>
317317
<profile>
318+
<!-- LTS version since SDP 25.3 (30.0.0 in 24.11)-->
318319
<id>druid-30.0.1</id>
319320
<properties>
320321
<java.version>17</java.version>
@@ -340,31 +341,7 @@
340341
</dependencies>
341342
</profile>
342343
<profile>
343-
<id>druid-33.0.0</id>
344-
<properties>
345-
<java.version>17</java.version>
346-
<druid.version>33.0.0</druid.version>
347-
<guava.version>32.0.1-jre</guava.version>
348-
<guice.version>4.1.0</guice.version>
349-
<!--
350-
jackson.version in 33.0.0 is actually specified as 2.12.7.20221012 but according to the release notes
351-
https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.12#micro-patches that is "only" the BOM which
352-
specifies almost all dependencies to be 2.12.7 with the exception of jackson-databind which is at 2.12.7.1:
353-
https://repo1.maven.org/maven2/com/fasterxml/jackson/jackson-bom/2.12.7.20221012/jackson-bom-2.12.7.20221012.pom
354-
so we override that here
355-
-->
356-
<jackson.version>2.12.7</jackson.version>
357-
</properties>
358-
<dependencies>
359-
<dependency>
360-
<groupId>com.fasterxml.jackson.core</groupId>
361-
<artifactId>jackson-databind</artifactId>
362-
<version>2.12.7.1</version>
363-
<scope>provided</scope>
364-
</dependency>
365-
</dependencies>
366-
</profile>
367-
<profile>
344+
<!-- Deprecated in SDP 26.3 -->
368345
<id>druid-34.0.0</id>
369346
<properties>
370347
<java.version>17</java.version>
@@ -401,6 +378,32 @@
401378
</dependencies>
402379
</dependencyManagement>
403380
</profile>
381+
<profile>
382+
<!-- Supported since SPD 26.3 -->
383+
<id>druid-35.0.1</id>
384+
<properties>
385+
<java.version>21</java.version>
386+
<druid.version>35.0.1</druid.version>
387+
<guava.version>32.1.3-jre</guava.version>
388+
<guice.version>5.1.0</guice.version>
389+
<jackson.version>2.19.2</jackson.version>
390+
</properties>
391+
<!--
392+
We need to override the guice version using <dependencyManagement> here, otherwise maven chooses the highest
393+
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
394+
which for some reason also wins in the conflict resolution, resulting in another version of the dependency than druid uses
395+
-->
396+
<dependencyManagement>
397+
<dependencies>
398+
<dependency>
399+
<groupId>com.google.inject</groupId>
400+
<artifactId>guice</artifactId>
401+
<version>${guice.version}</version>
402+
<scope>provided</scope>
403+
</dependency>
404+
</dependencies>
405+
</dependencyManagement>
406+
</profile>
404407
</profiles>
405408

406409
</project>

0 commit comments

Comments
 (0)