From d349a02a3a9b16e6dd417f75ca45280559a13bec Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Fri, 24 Feb 2023 12:01:32 +0530
Subject: [PATCH 1/5] Test

---
 .../org/apache/druid/server/coordinator/BalancerStrategy.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java b/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java
index 4a48137a888d..c6f906cc9c35 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java
@@ -37,7 +37,7 @@
 public interface BalancerStrategy
 {
   /**
-   * Find the best server to move a {@link DataSegment} to according the balancing strategy.
+   * Finds the best server to move a {@link DataSegment} to according the balancing strategy.
    * @param proposalSegment segment to move
    * @param serverHolders servers to consider as move destinations
    * @return The server to move to, or null if no move should be made or no server is suitable

From 36198d32080ed076c16bea10eb269ff7b5415e97 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Fri, 24 Feb 2023 13:27:07 +0530
Subject: [PATCH 2/5] Add missing license

---
 licenses.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/licenses.yaml b/licenses.yaml
index b3352f97cd91..3800cec54a71 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -5064,6 +5064,15 @@ libraries:
 
 ---
 
+name: jakarta.activation
+license_category: binary
+module: extensions/druid-avro-extensions
+license_name: Eclipse Distribution License 2.0
+version: 1.2.1
+libraries:
+  - com.sun.activation: jakarta.activation
+
+---
 
 # Web console modules start
 name: "@babel/code-frame"

From bfe47efd97621765bb01a136622e5e71ce4f8276 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Fri, 24 Feb 2023 14:30:28 +0530
Subject: [PATCH 3/5] Fix license_name

---
 licenses.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/licenses.yaml b/licenses.yaml
index 3800cec54a71..28f49d14d99f 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -5067,7 +5067,7 @@ libraries:
 name: jakarta.activation
 license_category: binary
 module: extensions/druid-avro-extensions
-license_name: Eclipse Distribution License 2.0
+license_name: Eclipse Distribution License 1.0
 version: 1.2.1
 libraries:
   - com.sun.activation: jakarta.activation

From ea3909b3e3f954b9141811ac768e513258381345 Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Fri, 24 Feb 2023 16:37:03 +0530
Subject: [PATCH 4/5] Revert extra change

---
 .../org/apache/druid/server/coordinator/BalancerStrategy.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java b/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java
index c6f906cc9c35..4a48137a888d 100644
--- a/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java
+++ b/server/src/main/java/org/apache/druid/server/coordinator/BalancerStrategy.java
@@ -37,7 +37,7 @@
 public interface BalancerStrategy
 {
   /**
-   * Finds the best server to move a {@link DataSegment} to according the balancing strategy.
+   * Find the best server to move a {@link DataSegment} to according the balancing strategy.
    * @param proposalSegment segment to move
    * @param serverHolders servers to consider as move destinations
    * @return The server to move to, or null if no move should be made or no server is suitable

From 04600fb18a298cd29a90d8041f3084461d805d4a Mon Sep 17 00:00:00 2001
From: Kashif Faraz <kashif.faraz@gmail.com>
Date: Fri, 24 Feb 2023 16:56:56 +0530
Subject: [PATCH 5/5] Remove profile bundle-contrib-exts from packaging check

---
 .github/workflows/static-checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
index a4bc58fe24d5..cc5ded8debf4 100644
--- a/.github/workflows/static-checks.yml
+++ b/.github/workflows/static-checks.yml
@@ -56,7 +56,7 @@ jobs:
       - name: packaging check
         run: |
           ./.github/scripts/setup_generate_license.sh
-          ${MVN} clean install -Prat -Pbundle-contrib-exts --fail-at-end \
+          ${MVN} clean install -Prat --fail-at-end \
           -pl '!benchmarks, !distribution' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -Dweb.console.skip=false -T1C
           ${MVN} install -Prat -Pdist -Pbundle-contrib-exts --fail-at-end \
           -pl 'distribution' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -Dweb.console.skip=false -T1C