Skip to content

Commit 23b2ef0

Browse files
sanderv32sanderv32
authored
Merge pull request #75 from nhojpatrick/jenkins-upgrade
Jenkins upgrade to 2.289.1
2 parents 0170afc + bf68bde commit 23b2ef0

File tree

4 files changed

+101
-36
lines changed

4 files changed

+101
-36
lines changed

‎pom.xml‎

Lines changed: 93 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34

45
<parent>
56
<groupId>org.jenkins-ci.plugins</groupId>
67
<artifactId>plugin</artifactId>
7-
<version>2.11</version>
8+
<version>4.34</version>
89
</parent>
910
<groupId>org.jenkins-ci.plugins</groupId>
1011
<artifactId>gogs-webhook</artifactId>
1112
<version>1.0.16-SNAPSHOT</version>
1213
<packaging>hpi</packaging>
1314

1415
<properties>
15-
<jenkins.version>1.625.3</jenkins.version>
16+
<jenkins.version>2.289.1</jenkins.version>
1617
<java.level>8</java.level>
17-
<jenkins-test-harness.version>2.13</jenkins-test-harness.version>
1818
<java.level.test>8</java.level.test>
1919
<findbugs.failOnError>false</findbugs.failOnError>
2020
</properties>
@@ -38,33 +38,72 @@
3838
</developer>
3939
</developers>
4040

41+
<dependencyManagement>
42+
<dependencies>
43+
<dependency>
44+
<groupId>io.jenkins.tools.bom</groupId>
45+
<artifactId>bom-2.289.x</artifactId>
46+
<version>961.vf0c9f6f59827</version>
47+
<type>pom</type>
48+
<scope>import</scope>
49+
</dependency>
50+
</dependencies>
51+
</dependencyManagement>
52+
4153
<dependencies>
4254
<dependency>
43-
<groupId>org.jenkins-ci.main</groupId>
44-
<artifactId>jenkins-war</artifactId>
45-
<type>war</type>
46-
<version>${jenkins.version}</version>
55+
<groupId>org.jenkins-ci.plugins</groupId>
56+
<artifactId>git</artifactId>
4757
<scope>test</scope>
4858
</dependency>
4959
<dependency>
5060
<groupId>org.jenkins-ci.plugins</groupId>
51-
<artifactId>git</artifactId>
52-
<version>2.2.5</version>
61+
<artifactId>git-client</artifactId>
62+
<scope>test</scope>
5363
</dependency>
5464
<dependency>
55-
<groupId>org.apache.httpcomponents</groupId>
56-
<artifactId>httpclient</artifactId>
57-
<version>4.5.3</version>
65+
<groupId>org.jenkins-ci.plugins</groupId>
66+
<artifactId>jsch</artifactId>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.jenkins-ci.plugins</groupId>
70+
<artifactId>apache-httpcomponents-client-4-api</artifactId>
5871
</dependency>
5972
<dependency>
6073
<groupId>commons-codec</groupId>
6174
<artifactId>commons-codec</artifactId>
62-
<version>1.10</version>
75+
<scope>provided</scope>
76+
</dependency>
77+
<dependency>
78+
<groupId>org.jenkins-ci</groupId>
79+
<artifactId>symbol-annotation</artifactId>
80+
</dependency>
81+
<dependency>
82+
<groupId>com.infradna.tool</groupId>
83+
<artifactId>bridge-method-annotation</artifactId>
84+
<version>1.18</version>
85+
<scope>provided</scope>
86+
</dependency>
87+
<dependency>
88+
<groupId>org.jenkins-ci</groupId>
89+
<artifactId>symbol-annotation</artifactId>
6390
</dependency>
6491
<dependency>
6592
<groupId>junit</groupId>
6693
<artifactId>junit</artifactId>
67-
<version>4.12</version>
94+
<version>4.13.2</version>
95+
<scope>test</scope>
96+
<exclusions>
97+
<exclusion>
98+
<groupId>org.hamcrest</groupId>
99+
<artifactId>hamcrest-core</artifactId>
100+
</exclusion>
101+
</exclusions>
102+
</dependency>
103+
<dependency>
104+
<groupId>org.hamcrest</groupId>
105+
<artifactId>hamcrest</artifactId>
106+
<version>2.2</version>
68107
<scope>test</scope>
69108
</dependency>
70109
<dependency>
@@ -79,30 +118,30 @@
79118
<version>25.0-jre</version>
80119
<!--<scope>test</scope>-->
81120
</dependency>
82-
<!--<dependency>-->
83-
<!--<groupId>org.apache.httpcomponents</groupId>-->
84-
<!--<artifactId>httpclient</artifactId>-->
85-
<!--<version>4.5.3</version>-->
86-
<!--<scope>test</scope>-->
87-
<!--</dependency>-->
88-
<dependency>
89-
<groupId>org.apache.httpcomponents</groupId>
90-
<artifactId>fluent-hc</artifactId>
91-
<version>4.5.3</version>
92-
<scope>test</scope>
93-
</dependency>
94121
<dependency>
95122
<groupId>org.eclipse.jgit</groupId>
96123
<artifactId>org.eclipse.jgit</artifactId>
97-
<version>4.7.0.201704051617-r</version>
124+
<version>5.13.0.202109080827-r</version>
98125
<scope>test</scope>
99126
</dependency>
100127
<dependency>
101128
<groupId>com.offbytwo.jenkins</groupId>
102129
<artifactId>jenkins-client</artifactId>
103-
<version>0.3.7</version>
130+
<version>0.3.8</version>
104131
<scope>test</scope>
105132
<exclusions>
133+
<exclusion>
134+
<groupId>com.fasterxml.jackson.core</groupId>
135+
<artifactId>jackson-annotations</artifactId>
136+
</exclusion>
137+
<exclusion>
138+
<groupId>com.fasterxml.jackson.core</groupId>
139+
<artifactId>jackson-core</artifactId>
140+
</exclusion>
141+
<exclusion>
142+
<groupId>com.fasterxml.jackson.core</groupId>
143+
<artifactId>jackson-databind</artifactId>
144+
</exclusion>
106145
<!-- a forked version already included by the core -->
107146
<exclusion>
108147
<groupId>dom4j</groupId>
@@ -113,9 +152,33 @@
113152
<dependency>
114153
<groupId>org.jenkins-ci.plugins</groupId>
115154
<artifactId>cloudbees-folder</artifactId>
116-
<version>6.3</version>
117155
<scope>test</scope>
118156
</dependency>
157+
<dependency>
158+
<groupId>org.jenkins-ci.plugins</groupId>
159+
<artifactId>credentials</artifactId>
160+
<scope>test</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>org.jenkins-ci.plugins</groupId>
164+
<artifactId>jackson2-api</artifactId>
165+
<scope>test</scope>
166+
</dependency>
167+
<dependency>
168+
<groupId>org.jenkins-ci.plugins</groupId>
169+
<artifactId>junit</artifactId>
170+
<scope>test</scope>
171+
</dependency>
172+
<dependency>
173+
<groupId>org.jenkins-ci.plugins</groupId>
174+
<artifactId>structs</artifactId>
175+
<scope>test</scope>
176+
</dependency>
177+
<dependency>
178+
<groupId>com.google.errorprone</groupId>
179+
<artifactId>error_prone_annotations</artifactId>
180+
<version>2.7.1</version>
181+
</dependency>
119182
</dependencies>
120183

121184
<profiles>

‎src/main/java/org/jenkinsci/plugins/gogs/GogsPayloadProcessor.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ associated documentation files (the "Software"), to deal in the Software without
2727
import hudson.model.Cause;
2828
import hudson.security.ACL;
2929
import hudson.triggers.Trigger;
30+
import hudson.triggers.TriggerDescriptor;
3031
import jenkins.model.ParameterizedJobMixIn;
3132
import jenkins.triggers.SCMTriggerItem;
3233
import org.acegisecurity.context.SecurityContext;
@@ -61,7 +62,8 @@ public GogsResults triggerJobs(String jobName, String deliveryID) {
6162

6263
if (project instanceof ParameterizedJobMixIn.ParameterizedJob) {
6364
ParameterizedJobMixIn.ParameterizedJob pJob = (ParameterizedJobMixIn.ParameterizedJob) project;
64-
for (Trigger trigger : pJob.getTriggers().values()) {
65+
Map<TriggerDescriptor, Trigger> triggers = pJob.getTriggers();
66+
for (Trigger trigger : triggers.values()) {
6567
if (trigger instanceof GogsTrigger) {
6668
gTrigger = (GogsTrigger) trigger;
6769
break;

‎src/test/java/org/jenkinsci/plugins/gogs/GogsWebHookJenkinsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import java.io.File;
1515
import java.nio.charset.StandardCharsets;
1616

17-
import static org.hamcrest.CoreMatchers.containsString;
18-
import static org.hamcrest.CoreMatchers.not;
17+
import static org.hamcrest.core.IsNot.not;
18+
import static org.hamcrest.core.StringContains.containsString;
1919
import static org.junit.Assert.assertSame;
2020
import static org.junit.Assert.assertThat;
2121

‎src/test/java/org/jenkinsci/plugins/gogs/GogsWebHook_IT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
//FIXME: the test should run in sequence
4949

5050
public class GogsWebHook_IT {
51+
5152
private static final String JENKINS_URL = "http://localhost:8080/";
5253
private static final String JENKINS_USER = "butler";
5354
private static final String JENKINS_PASSWORD = "butler";
@@ -180,7 +181,7 @@ private void doItTest(final String jenkinsJobName,
180181
log.info("Next build number: " + expectedBuildNbr);
181182

182183
//Build the job
183-
jobAtIntitalState.build();
184+
jobAtIntitalState.build(true);
184185

185186
//Wait for the job to complete
186187
long timeOut = 60000L;
@@ -315,5 +316,4 @@ private void waitForBuildToComplete(JenkinsServer jenkins, int expectedBuildNbr,
315316
}
316317
}
317318

318-
319-
}
319+
}

0 commit comments

Comments
 (0)