Skip to content

Commit 15300a9

Browse files
committed
Require 2.346.3
1 parent a324548 commit 15300a9

File tree

7 files changed

+12
-16
lines changed

7 files changed

+12
-16
lines changed

pom.xml

+6-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.18</version>
7+
<version>4.51</version>
88
<relativePath />
99
</parent>
1010

@@ -24,14 +24,14 @@
2424
</scm>
2525

2626
<properties>
27+
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
28+
<jenkins.baseline>2.346</jenkins.baseline>
2729
<!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
28-
<jenkins.version>2.263.1</jenkins.version>
29-
<java.level>8</java.level>
30+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
3031
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
3132
<pipeline-model-definition.version>1.6.0</pipeline-model-definition.version>
3233
<revision>1.0.0</revision>
3334
<changelist>-SNAPSHOT</changelist>
34-
<jenkins-test-harness.version>2.34</jenkins-test-harness.version>
3535
<kubernetes-server-mock.version>5.4.0</kubernetes-server-mock.version>
3636
<tekton-client.version>5.4.0</tekton-client.version>
3737
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
@@ -115,7 +115,6 @@
115115
<dependency>
116116
<groupId>org.jenkins-ci.plugins</groupId>
117117
<artifactId>pipeline-utility-steps</artifactId>
118-
<version>2.7.1</version>
119118
<scope>test</scope>
120119
</dependency>
121120

@@ -125,8 +124,8 @@
125124
<dependencies>
126125
<dependency>
127126
<groupId>io.jenkins.tools.bom</groupId>
128-
<artifactId>bom-2.249.x</artifactId>
129-
<version>29</version>
127+
<artifactId>bom-${jenkins.baseline}.x</artifactId>
128+
<version>1763.v092b_8980a_f5e</version>
130129
<scope>import</scope>
131130
<type>pom</type>
132131
</dependency>
@@ -192,7 +191,6 @@
192191
<plugin>
193192
<groupId>org.apache.maven.plugins</groupId>
194193
<artifactId>maven-surefire-plugin</artifactId>
195-
<version>3.0.0-M5</version>
196194
</plugin>
197195
<plugin>
198196
<groupId>org.codehaus.mojo</groupId>

src/main/java/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRaw.java

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import java.time.LocalDateTime;
4343
import java.time.ZoneOffset;
4444
import java.util.ArrayList;
45-
import java.util.Arrays;
4645
import java.util.Optional;
4746
import org.apache.commons.lang.StringUtils;
4847
import org.jenkinsci.Symbol;

src/main/java/org/waveywaves/jenkins/plugins/tekton/client/build/delete/DeleteRaw.java

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
1717
import io.fabric8.tekton.pipeline.v1beta1.Task;
1818
import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
19-
import io.fabric8.tekton.resource.v1alpha1.PipelineResource;
2019
import org.jenkinsci.Symbol;
2120
import org.kohsuke.stapler.DataBoundConstructor;
2221
import org.kohsuke.stapler.DataBoundSetter;

src/main/java/org/waveywaves/jenkins/plugins/tekton/client/logwatch/PipelineRunLogWatch.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package org.waveywaves.jenkins.plugins.tekton.client.logwatch;
22

33
import com.google.common.base.Strings;
4-
import io.fabric8.kubernetes.api.model.*;
4+
import io.fabric8.kubernetes.api.model.ListOptions;
5+
import io.fabric8.kubernetes.api.model.OwnerReference;
56
import io.fabric8.kubernetes.client.KubernetesClient;
67
import io.fabric8.tekton.client.TektonClient;
7-
import io.fabric8.tekton.pipeline.v1beta1.*;
8+
import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
9+
import io.fabric8.tekton.pipeline.v1beta1.PipelineTask;
10+
import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
811

912
import java.io.IOException;
1013
import java.io.OutputStream;
1114
import java.nio.charset.StandardCharsets;
1215
import java.util.List;
13-
import java.util.concurrent.ConcurrentHashMap;
1416
import java.util.logging.Logger;
1517

1618
public class PipelineRunLogWatch implements Runnable {

src/test/java/org/waveywaves/jenkins/plugins/tekton/client/LogUtilsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.logging.LogRecord;
1010
import java.util.logging.Logger;
1111

12-
import static org.assertj.core.api.Assertions.*;
12+
import static org.assertj.core.api.Assertions.assertThat;
1313

1414
/**
1515
*/

src/test/java/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRawMockServerTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import hudson.EnvVars;
44
import io.fabric8.knative.internal.pkg.apis.Condition;
5-
import io.fabric8.kubernetes.api.model.ConditionBuilder;
65
import io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition;
76
import io.fabric8.kubernetes.client.KubernetesClient;
87

src/test/java/org/waveywaves/jenkins/plugins/tekton/client/build/create/CreateRawTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.nio.file.Files;
1919
import java.nio.file.Path;
2020

21-
import static org.assertj.core.api.Assertions.assertThat;
2221
import static org.hamcrest.CoreMatchers.is;
2322
import static org.hamcrest.CoreMatchers.notNullValue;
2423
import static org.hamcrest.MatcherAssert.assertThat;

0 commit comments

Comments
 (0)