Merge pull request #338 from jenkinsci/java11

Use Jenkins 2.387.1 as baseline
jenkinsci · Mar 10, 2023 · e68a332 · e68a332
2 parents 8b33006 + 4cd4ef8
commit e68a332
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 8,361 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,8 @@
     "mark.js": "^8.11.1",
     "remark-cli": "^11.0.0",
     "remark-lint": "^9.1.1",
-    "remark-preset-lint-recommended": "^6.1.2"
+    "remark-preset-lint-recommended": "^6.1.2",
+    "luxon": "^3.3.0"
   },
   "devDependencies": {},
   "scripts": {

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>6.1.0</version>
+    <version>6.2.0</version>
     <relativePath />
   </parent>
 
@@ -18,11 +18,17 @@
   <url>https://github.com/jenkinsci/data-tables-api-plugin</url>
 
   <properties>
-    <revision>1.12.1-5</revision>
+    <revision>1.13.3-1</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <json-unit-assertj.version>2.36.1</json-unit-assertj.version>
     <module.name>${project.groupId}.datatables</module.name>
+
+    <jquery3-api.version>3.6.3-1-rc365.70899fb_d9e1d</jquery3-api.version>
+    <plugin-util-api.version>3.0.0-rc693.c098b_871ea_49</plugin-util-api.version>
+    <bootstrap5-api.version>5.2.2-1-rc442.6631330fec41</bootstrap5-api.version>
+    <font-awesome-api.version>6.3.0-1-rc517.f6b_6e5a_dd4ef</font-awesome-api.version>
+
   </properties>
 
   <licenses>
@@ -45,18 +51,22 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
+      <version>${plugin-util-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>jquery3-api</artifactId>
+      <version>${jquery3-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>bootstrap5-api</artifactId>
+      <version>${bootstrap5-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>font-awesome-api</artifactId>
+      <version>${font-awesome-api.version}</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -128,6 +138,10 @@
             <configuration>
               <outputDirectory>${project.build.directory}/${project.artifactId}/js</outputDirectory>
               <resources>
+                <resource>
+                  <directory>${project.basedir}/node_modules/luxon/build/global</directory>
+                  <filtering>false</filtering>
+                </resource>
                 <resource>
                   <directory>${project.basedir}/node_modules/datatables.net/js</directory>
                   <filtering>false</filtering>
@@ -228,6 +242,7 @@
           </packages>
           <excludes>
             <exclude>.*DetailedCell.*</exclude>
+            <exclude>.*TableModelDetailedColumnDefinition.*</exclude>
           </excludes>
           <entryPointClassPackage>io.jenkins.plugins.datatables.assertions</entryPointClassPackage>
         </configuration>

diff --git a/skip.sh b/skip.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+JENKINS_HOME=../docker/volumes/jenkins-home
+
+mvn clean install -Pskip || { echo "Build failed"; exit 1; }
+
+echo "Installing plugin in $JENKINS_HOME"
+
+rm -rf $JENKINS_HOME/plugins/data-tables-api-plugin*
+cp -fv target/data-tables-api.hpi $JENKINS_HOME/plugins/data-tables-api.jpi
+
+CURRENT_UID="$(id -u):$(id -g)"
+export CURRENT_UID
+IS_RUNNING=$(docker-compose ps -q jenkins-controller)
+if [[ "$IS_RUNNING" != "" ]]; then
+    docker-compose restart
+    echo "Restarting Jenkins (docker compose with user ID ${CURRENT_UID}) ..."
+fi
diff --git a/src/main/java/io/jenkins/plugins/datatables/TableColumn.java b/src/main/java/io/jenkins/plugins/datatables/TableColumn.java
@@ -1,17 +1,15 @@
 package io.jenkins.plugins.datatables;
 
 import org.apache.commons.lang3.StringUtils;
+import org.jenkins.ui.symbol.Symbol;
+import org.jenkins.ui.symbol.SymbolRequest.Builder;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-import edu.hm.hafner.util.VisibleForTesting;
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 
-import j2html.tags.UnescapedText;
-
-import io.jenkins.plugins.fontawesome.api.SvgTag;
 import io.jenkins.plugins.util.JenkinsFacade;
 
 import static j2html.TagCreator.*;
@@ -31,9 +29,6 @@
  * @author Ullrich Hafner
  */
 public class TableColumn {
-    @VisibleForTesting
-    static final String DETAILS_COLUMN_ICON_NAME = "circle-plus";
-
     /**
      * Renders an expandable details-column with the specified text.
      *
@@ -43,7 +38,11 @@ public class TableColumn {
      * @return the HTML div to create the details column
      */
     public static String renderDetailsColumn(final String detailsText) {
-        return renderDetailsColumn(detailsText, new JenkinsFacade());
+        return div()
+                .withClass("details-control")
+                .attr("data-description", detailsText)
+                .with(join(symbol("add", "open"),
+                        symbol("remove", "close"))).render();
     }
 
     /**
@@ -55,14 +54,19 @@ public static String renderDetailsColumn(final String detailsText) {
      *         facade for Jenkins API calls
      *
      * @return the HTML div to create the details column
+     * @deprecated use {@link #renderDetailsColumn(String)}
      */
-    public static String renderDetailsColumn(final String detailsText, final JenkinsFacade jenkinsFacade) {
-        return div()
-                .withClass("details-control")
-                .attr("data-description", detailsText)
-                .with(new UnescapedText(
-                        new SvgTag(DETAILS_COLUMN_ICON_NAME, jenkinsFacade).withClasses("details-icon").render()))
-                .render();
+    @Deprecated
+    public static String renderDetailsColumn(final String detailsText, @SuppressWarnings("unused") final JenkinsFacade jenkinsFacade) {
+        return renderDetailsColumn(detailsText);
+    }
+
+    private static String symbol(final String imageName, final String cssId) {
+        return Symbol.get(new Builder()
+                .withName(imageName + "-circle-outline")
+                .withPluginName("ionicons-api")
+                .withClasses("details-icon details-icon-" + cssId)
+                .build());
     }
 
     private final String headerLabel;

diff --git a/src/main/webapp/css/jenkins-style.css b/src/main/webapp/css/jenkins-style.css
@@ -29,6 +29,10 @@ tfoot {
     color: inherit;
 }
 
+div.dataTables_wrapper div.dt-row {
+    padding-bottom: 0.85em;
+}
+
 /* ------------------------------------------------------------------------------------------------------------------- */
 /* DataTables Details                                                                                                  */
 /* ------------------------------------------------------------------------------------------------------------------- */