Merge pull request #153 from jenkinsci/analysis-pom-5.0.0

Bump version of analysis pom to 5.0.0

Author: uhafner

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jvnet.hudson.plugins</groupId>
     <artifactId>analysis-pom</artifactId>
-    <version>4.7.0</version>
+    <version>5.0.0</version>
     <relativePath />
   </parent>
 
@@ -28,13 +28,10 @@
 
     <module.name>${project.groupId}.datatables</module.name>
 
-    <jquery3-api.version>3.5.1-2</jquery3-api.version>
-    <font-awesome-api.version>5.15.2-1</font-awesome-api.version>
-    <bootstrap4-api.version>4.6.0-1</bootstrap4-api.version>
-    <plugin-util-api.version>1.7.0</plugin-util-api.version>
-
-    <commons.lang.version>3.9</commons.lang.version>
-    <jackson2-api.version>2.11.1</jackson2-api.version>
+    <jquery3-api.version>3.5.1-3</jquery3-api.version>
+    <font-awesome-api.version>5.15.2-2</font-awesome-api.version>
+    <bootstrap4-api.version>4.6.0-2</bootstrap4-api.version>
+    <plugin-util-api.version>2.0.0</plugin-util-api.version>
   </properties>
 
   <licenses>
@@ -77,6 +74,8 @@
       <version>${datatables-buttons.version}</version>
       <scope>provided</scope>
     </dependency>
+
+    <!-- Jenkins Plugin Dependencies -->
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>plugin-util-api</artifactId>
@@ -85,22 +84,18 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>jquery3-api</artifactId>
-      <version>${jquery3-api.version}</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>bootstrap4-api</artifactId>
-      <version>${bootstrap4-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>
       <artifactId>jackson2-api</artifactId>
-      <version>${jackson2-api.version}</version>
     </dependency>
 
     <!-- Test Dependencies -->

src/main/java/io/jenkins/plugins/datatables/TableConfiguration.java

@@ -13,7 +13,6 @@
  * @author Andreas Pabst
  */
 public class TableConfiguration {
-
     private final Map<String, Object> configuration = new HashMap<>();
 
     private boolean useResponsive = false;
@@ -28,8 +27,8 @@ public class TableConfiguration {
      * @see <a href="https://datatables.net/extensions/responsive/">https://datatables.net/extensions/responsive/</a>
      */
     public TableConfiguration responsive() {
-        this.configuration.put("responsive", true);
-        this.useResponsive = true;
+        configuration.put("responsive", true);
+        useResponsive = true;
         return this;
     }
 
@@ -50,8 +49,8 @@ public boolean isUseResponsive() {
      * @see <a href="https://datatables.net/extensions/colreorder/">https://datatables.net/extensions/colreorder/</a>
      */
     public TableConfiguration colReorder() {
-        this.configuration.put("colReorder", true);
-        this.useColReorder = true;
+        configuration.put("colReorder", true);
+        useColReorder = true;
         return this;
     }
 
@@ -72,8 +71,8 @@ public boolean isUseColReorder() {
      * @see <a href="https://datatables.net/extensions/buttons/">https://datatables.net/extensions/buttons/</a>
      */
     public TableConfiguration buttons() {
-        this.configuration.put("buttons", true);
-        this.useButtons = true;
+        configuration.put("buttons", true);
+        useButtons = true;
         return this;
     }
 
@@ -85,11 +84,11 @@ public TableConfiguration buttons() {
      *
      * @return this {@link TableConfiguration} for chaining methods
      *
-     * @see <a href="https://datatables.net/extensions/buttons/built-in">https://datatables.net/extensions/buttons/built-in</a> for more information on available buttons
+     * @see <a href="https://datatables.net/extensions/buttons/built-in">https://datatables.net/extensions/buttons/built-in</a>
      */
     public TableConfiguration buttons(final String... types) {
-        this.configuration.put("buttons", types);
-        this.useButtons = true;
+        configuration.put("buttons", types);
+        useButtons = true;
         return this;
     }
 
@@ -110,7 +109,7 @@ public boolean isUseButtons() {
      * @see <a href="https://datatables.net/reference/option/stateSave">https://datatables.net/reference/option/stateSave</a>
      */
     public TableConfiguration stateSave() {
-        this.configuration.put("stateSave", true);
+        configuration.put("stateSave", true);
         return this;
     }
 

src/test/java/io/jenkins/plugins/datatables/TableColumnTest.java

@@ -3,7 +3,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 
-import io.jenkins.plugins.datatables.TableColumn.*;
 import io.jenkins.plugins.util.JenkinsFacade;
 
 import static io.jenkins.plugins.datatables.TableColumn.*;
@@ -35,7 +34,7 @@ void shouldCreateColumnWithComplexDescription() {
 
         assertThat(column).hasHeaderLabel(LABEL);
         assertThat(column).hasDefinition("{  \"type\": \"integer\",  "
-                + "\"data\": \"one\",  " 
+                + "\"data\": \"one\",  "
                 + "\"defaultContent\": \"\",  "
                 + "\"render\": {     \"_\": \"display\",     \"sort\": \"sort\"  }}");
         assertThat(column).hasHeaderClass(StringUtils.EMPTY);
@@ -59,7 +58,7 @@ void shouldCreateDetailsColumnDiv() {
         JenkinsFacade jenkinsFacade = mock(JenkinsFacade.class);
         when(jenkinsFacade.getImagePath(DETAILS_COLUMN_ICON_NAME)).thenReturn("/path/to/icon");
 
-        assertThat(TableColumn.renderDetailsColumn("details text", jenkinsFacade))
+        assertThat(renderDetailsColumn("details text", jenkinsFacade))
                 .isEqualTo("<div class=\"details-control\" data-description=\"details text\">"
                         + "<svg class=\"details-icon svg-icon\"><use href></use>"
                         + "</svg>"