diff --git a/druid.yaml b/druid.yaml index 3932509a8d4..ce8128c1882 100644 --- a/druid.yaml +++ b/druid.yaml @@ -1,7 +1,7 @@ package: name: druid - version: "32.0.1" - epoch: 2 + version: "33.0.0" + epoch: 0 description: Apache Druid is a high performance real-time analytics database. copyright: - license: Apache-2.0 @@ -29,14 +29,10 @@ pipeline: with: repository: https://github.com/apache/druid.git tag: druid-${{package.version}} - expected-commit: a0420265af08e285527893a3c26dbfdf85d87784 + expected-commit: 84b59b984b69ebc34e0c971ad207b69384941c0b - uses: maven/pombump - - uses: patch - with: - patches: GHSA-2c59-37c4-qrx5-fix.patch - - runs: | mvn -B -ff -q \ install \ diff --git a/druid/GHSA-2c59-37c4-qrx5-fix.patch b/druid/GHSA-2c59-37c4-qrx5-fix.patch deleted file mode 100644 index 8d282637905..00000000000 --- a/druid/GHSA-2c59-37c4-qrx5-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/extensions-core/parquet-extensions/pom.xml b/extensions-core/parquet-extensions/pom.xml -index c6aaf4c6f7..3211604ac9 100644 ---- a/extensions-core/parquet-extensions/pom.xml -+++ b/extensions-core/parquet-extensions/pom.xml -@@ -33,7 +33,7 @@ - 4.0.0 - - -- 1.13.1 -+ 1.15.1 - - - -@@ -201,7 +201,7 @@ - - - -- 1.13.0 -+ 1.15.1 - - - diff --git a/druid/pombump-deps.yaml b/druid/pombump-deps.yaml index 54f66caeb17..f38a166d29b 100644 --- a/druid/pombump-deps.yaml +++ b/druid/pombump-deps.yaml @@ -8,9 +8,6 @@ patches: - groupId: io.airlift artifactId: aircompressor version: "0.27" - - groupId: org.asynchttpclient - artifactId: async-http-client - version: 2.12.4 - groupId: org.apache.solr artifactId: solr-solrj version: 8.11.3