Require 2.346.3

jenkinsci · Jan 30, 2025 · 991d8f5 · 991d8f5
1 parent a324548
commit 991d8f5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 16 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.18</version>
+        <version>4.51</version>
         <relativePath />
     </parent>
 
@@ -24,14 +24,15 @@
     </scm>
 
     <properties>
+        <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+        <jenkins.baseline>2.346</jenkins.baseline>
         <!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
-        <jenkins.version>2.263.1</jenkins.version>
-        <java.level>8</java.level>
+        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <pipeline-model-definition.version>1.6.0</pipeline-model-definition.version>
         <revision>1.0.0</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins-test-harness.version>2.34</jenkins-test-harness.version>
+        <jenkins-test-harness.version>1900.v9e128c991ef4</jenkins-test-harness.version>
         <kubernetes-server-mock.version>5.4.0</kubernetes-server-mock.version>
         <tekton-client.version>5.4.0</tekton-client.version>
         <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
@@ -115,7 +116,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>pipeline-utility-steps</artifactId>
-            <version>2.7.1</version>
             <scope>test</scope>
         </dependency>
 
@@ -125,8 +125,8 @@
       <dependencies>
         <dependency>
           <groupId>io.jenkins.tools.bom</groupId>
-          <artifactId>bom-2.249.x</artifactId>
-          <version>29</version>
+          <artifactId>bom-${jenkins.baseline}.x</artifactId>
+          <version>1763.v092b_8980a_f5e</version>
           <scope>import</scope>
           <type>pom</type>
         </dependency>
@@ -192,7 +192,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M5</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/src/main/java/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRaw.java b/src/main/java/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRaw.java
@@ -42,7 +42,6 @@
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Optional;
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;

diff --git a/src/main/java/org/waveywaves/jenkins/plugins/tekton/client/build/delete/DeleteRaw.java b/src/main/java/org/waveywaves/jenkins/plugins/tekton/client/build/delete/DeleteRaw.java
@@ -16,7 +16,6 @@
 import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
 import io.fabric8.tekton.pipeline.v1beta1.Task;
 import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
-import io.fabric8.tekton.resource.v1alpha1.PipelineResource;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;

diff --git a/src/main/java/org/waveywaves/jenkins/plugins/tekton/client/logwatch/PipelineRunLogWatch.java b/src/main/java/org/waveywaves/jenkins/plugins/tekton/client/logwatch/PipelineRunLogWatch.java
@@ -1,16 +1,18 @@
 package org.waveywaves.jenkins.plugins.tekton.client.logwatch;
 
 import com.google.common.base.Strings;
-import io.fabric8.kubernetes.api.model.*;
+import io.fabric8.kubernetes.api.model.ListOptions;
+import io.fabric8.kubernetes.api.model.OwnerReference;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.tekton.client.TektonClient;
-import io.fabric8.tekton.pipeline.v1beta1.*;
+import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
+import io.fabric8.tekton.pipeline.v1beta1.PipelineTask;
+import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
 
 public class PipelineRunLogWatch implements Runnable {

diff --git a/src/test/java/org/waveywaves/jenkins/plugins/tekton/client/LogUtilsTest.java b/src/test/java/org/waveywaves/jenkins/plugins/tekton/client/LogUtilsTest.java
@@ -9,7 +9,7 @@
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  */

diff --git a/...va/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRawMockServerTest.java b/...va/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRawMockServerTest.java
@@ -2,7 +2,6 @@
 
 import hudson.EnvVars;
 import io.fabric8.knative.internal.pkg.apis.Condition;
-import io.fabric8.kubernetes.api.model.ConditionBuilder;
 import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
 import io.fabric8.kubernetes.client.KubernetesClient;
 

diff --git a/src/test/java/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRawTest.java b/src/test/java/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRawTest.java
@@ -18,7 +18,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;