Merge branch 'master' of https://gitbox.apache.org/repos/asf/director…

…y-server
apache · Aug 16, 2024 · 51da44a · 51da44a
2 parents 9da1a4d + 564328a
commit 51da44a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/.github/workflows/pull-request-build.yaml b/.github/workflows/pull-request-build.yaml
@@ -8,21 +8,37 @@ permissions:
   contents: read
 
 jobs:
-  build:
+  build-java-8:
     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 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
         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
diff --git 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>
@@ -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>