From 3adc9928b14a4a7a84fafbe005732ba32e792945 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Thu, 15 Aug 2024 08:16:53 +0100
Subject: [PATCH 1/6] Revert "Switching PR builder to use Java 11"

This reverts commit a6d83ef6c3f06ef2fc71f118d65b05cb6fe37e97.
---
 .github/workflows/pull-request-build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pull-request-build.yaml b/.github/workflows/pull-request-build.yaml
index 92e927fcd0..a03592822f 100644
--- a/.github/workflows/pull-request-build.yaml
+++ b/.github/workflows/pull-request-build.yaml
@@ -16,10 +16,10 @@ jobs:
     timeout-minutes: 130
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - name: Set up JDK 11
+      - name: Set up JDK 8
         uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'temurin'
           cache: maven
       - name: Build with Apache Maven

From e57b4b752ff69750d3654babfd66f94c84168620 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Thu, 15 Aug 2024 08:20:02 +0100
Subject: [PATCH 2/6] Skipping checkstyle for build

---
 .github/workflows/pull-request-build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request-build.yaml b/.github/workflows/pull-request-build.yaml
index a03592822f..0547070c0d 100644
--- a/.github/workflows/pull-request-build.yaml
+++ b/.github/workflows/pull-request-build.yaml
@@ -23,6 +23,6 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Build with Apache Maven
-        run: mvn -U clean install -Djava.awt.headless=true -fae -B
+        run: mvn -U clean install -Djava.awt.headless=true -fae -B -Dcheckstyle.skip
     env: 
        MAVEN_OPTS: "-Xmx1024M"

From 675e8aae8d283ee95792e6def77872d62a1c60fb Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Thu, 15 Aug 2024 08:21:25 +0100
Subject: [PATCH 3/6] Revert "Skipping checkstyle for build"

This reverts commit e57b4b752ff69750d3654babfd66f94c84168620.
---
 .github/workflows/pull-request-build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request-build.yaml b/.github/workflows/pull-request-build.yaml
index 0547070c0d..a03592822f 100644
--- a/.github/workflows/pull-request-build.yaml
+++ b/.github/workflows/pull-request-build.yaml
@@ -23,6 +23,6 @@ jobs:
           distribution: 'temurin'
           cache: maven
       - name: Build with Apache Maven
-        run: mvn -U clean install -Djava.awt.headless=true -fae -B -Dcheckstyle.skip
+        run: mvn -U clean install -Djava.awt.headless=true -fae -B
     env: 
        MAVEN_OPTS: "-Xmx1024M"

From fef4bfd42c8627a959c2467567a25ffc38ac3b0d Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Thu, 15 Aug 2024 08:24:47 +0100
Subject: [PATCH 4/6] Skipping checkstyle for JDK8 like for the API

---
 pom.xml | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ea757a00b..ae33fd5b05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -534,11 +534,6 @@
         </configuration>
       </plugin -->
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -1356,6 +1351,23 @@
     </dependency -->
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>checkstyle-activation</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <scm>
     <connection>scm:git:https://gitbox.apache.org/repos/asf/directory-server.git</connection>
     <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/directory-server.git</developerConnection>

From 4bbb2f6213ae5f123900f3bde80d98264425b0ff Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Thu, 15 Aug 2024 08:42:20 +0100
Subject: [PATCH 5/6] Adding JDK17 to PR builds

---
 .github/workflows/pull-request-build.yaml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pull-request-build.yaml b/.github/workflows/pull-request-build.yaml
index a03592822f..2133c5e4d3 100644
--- a/.github/workflows/pull-request-build.yaml
+++ b/.github/workflows/pull-request-build.yaml
@@ -8,7 +8,7 @@ permissions:
   contents: read
 
 jobs:
-  build:
+  build-java-8:
     runs-on: ubuntu-latest
     permissions:
       contents: read  
@@ -26,3 +26,19 @@ jobs:
         run: mvn -U clean install -Djava.awt.headless=true -fae -B
     env: 
        MAVEN_OPTS: "-Xmx1024M"
+  build-java-17:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read  
+      pull-requests: read
+    timeout-minutes: 130
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - name: Set up JDK 17
+        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Apache Maven
+        run: mvn -U clean install -Djava.awt.headless=true -fae -B

From 564328a328482297d69e30ed1f1ec6a06bc7ff47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2024 08:53:40 +0100
Subject: [PATCH 6/6] Bump kerby.version from 2.0.3 to 2.1.0 (#215)

Bumps `kerby.version` from 2.0.3 to 2.1.0.

Updates `org.apache.kerby:kerb-simplekdc` from 2.0.3 to 2.1.0

Updates `org.apache.kerby:kerby-kdc` from 2.0.3 to 2.1.0

---
updated-dependencies:
- dependency-name: org.apache.kerby:kerb-simplekdc
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: org.apache.kerby:kerby-kdc
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae33fd5b05..3b55019ef5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
     <!-- The Jetty bundle exports are using version 9.4.5, not 9.4.5.v20170502... -->
     <jetty.bundle.version>9.4.48</jetty.bundle.version>
     <junit.jupiter.api.version>5.10.3</junit.jupiter.api.version>
-    <kerby.version>2.0.3</kerby.version>
+    <kerby.version>2.1.0</kerby.version>
     <ldapsdk.version>4.1</ldapsdk.version>
     <logback.version>1.5.6</logback.version>
     <maven.version>3.9.8</maven.version>