Skip to content

Commit 4de73bf

Browse files
dwnusbaumdwnusbaum
authored
Merge pull request #44 from dwnusbaum/updates
Update minimum required core version and dependencies
2 parents a1468e1 + 4b25eb9 commit 4de73bf

File tree

3 files changed

+20
-92
lines changed

3 files changed

+20
-92
lines changed

‎.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.0-beta-7</version>
5+
<version>1.2</version>
66
</extension>
77
</extensions>

‎pom.xml

Lines changed: 13 additions & 84 deletions
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>3.54</version>
7+
<version>4.16</version>
88
<relativePath />
99
</parent>
1010
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -40,205 +40,134 @@
4040
<properties>
4141
<revision>2.12</revision>
4242
<changelist>-SNAPSHOT</changelist>
43-
<jenkins.version>2.60</jenkins.version>
43+
<jenkins.version>2.222.4</jenkins.version>
4444
<java.level>8</java.level>
45-
<scm-api-plugin.version>2.2.6</scm-api-plugin.version>
46-
<git-plugin.version>3.6.0</git-plugin.version>
47-
<subversion-plugin.version>2.10.5</subversion-plugin.version>
48-
<workflow-step-api-plugin.version>2.9</workflow-step-api-plugin.version>
49-
<workflow-support-plugin.version>2.14</workflow-support-plugin.version>
45+
<subversion-plugin.version>2.14.0</subversion-plugin.version>
46+
<svnkit.version>1.10.1</svnkit.version>
5047
</properties>
5148
<dependencyManagement>
5249
<dependencies>
5350
<dependency>
54-
<groupId>org.jenkins-ci.plugins</groupId>
55-
<artifactId>credentials</artifactId>
56-
<version>2.1.15</version>
51+
<groupId>io.jenkins.tools.bom</groupId>
52+
<artifactId>bom-2.222.x</artifactId>
53+
<version>23</version>
54+
<scope>import</scope>
55+
<type>pom</type>
5756
</dependency>
5857
<dependency>
5958
<groupId>org.tmatesoft.svnkit</groupId>
6059
<artifactId>svnkit</artifactId>
61-
<version>1.9.2</version>
60+
<version>${svnkit.version}</version>
6261
</dependency>
6362
</dependencies>
6463
</dependencyManagement>
6564
<dependencies>
6665
<dependency>
6766
<groupId>${project.groupId}</groupId>
6867
<artifactId>workflow-step-api</artifactId>
69-
<version>${workflow-step-api-plugin.version}</version>
7068
</dependency>
7169
<dependency>
7270
<groupId>org.jenkins-ci.plugins</groupId>
7371
<artifactId>scm-api</artifactId>
74-
<version>${scm-api-plugin.version}</version>
7572
<scope>test</scope>
7673
</dependency>
7774
<dependency>
7875
<groupId>org.jenkins-ci.plugins</groupId>
7976
<artifactId>scm-api</artifactId>
80-
<version>${scm-api-plugin.version}</version>
8177
<classifier>tests</classifier>
8278
<scope>test</scope>
8379
</dependency>
8480
<dependency>
8581
<groupId>org.jenkins-ci.plugins</groupId>
8682
<artifactId>git</artifactId>
87-
<version>${git-plugin.version}</version>
88-
<scope>test</scope>
89-
<exclusions>
90-
<exclusion>
91-
<groupId>org.apache.httpcomponents</groupId>
92-
<artifactId>httpclient</artifactId>
93-
</exclusion>
94-
<exclusion>
95-
<groupId>org.jenkins-ci</groupId>
96-
<artifactId>annotation-indexer</artifactId>
97-
</exclusion>
98-
<exclusion>
99-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
100-
<artifactId>workflow-scm-step</artifactId>
101-
</exclusion>
102-
</exclusions>
83+
<scope>test</scope>
10384
</dependency>
10485
<dependency>
10586
<groupId>org.jenkins-ci.plugins</groupId>
10687
<artifactId>git</artifactId>
107-
<version>${git-plugin.version}</version>
10888
<classifier>tests</classifier>
10989
<scope>test</scope>
110-
<exclusions>
111-
<exclusion> <!-- TODO IIRC this was a mistake in git-client which was since fixed -->
112-
<groupId>org.jenkins-ci</groupId>
113-
<artifactId>annotation-indexer</artifactId>
114-
</exclusion>
115-
<exclusion>
116-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
117-
<artifactId>workflow-scm-step</artifactId>
118-
</exclusion>
119-
</exclusions>
12090
</dependency>
12191
<dependency>
12292
<groupId>org.jenkins-ci.plugins</groupId>
12393
<artifactId>subversion</artifactId>
12494
<version>${subversion-plugin.version}</version>
12595
<scope>test</scope>
126-
<exclusions>
127-
<exclusion>
128-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
129-
<artifactId>workflow-scm-step</artifactId>
130-
</exclusion>
131-
</exclusions>
13296
</dependency>
13397
<dependency>
13498
<groupId>org.jenkins-ci.plugins</groupId>
13599
<artifactId>subversion</artifactId>
136100
<version>${subversion-plugin.version}</version>
137101
<classifier>tests</classifier>
138102
<scope>test</scope>
139-
<exclusions>
140-
<exclusion>
141-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
142-
<artifactId>workflow-scm-step</artifactId>
143-
</exclusion>
144-
</exclusions>
145103
</dependency>
146104
<dependency>
147105
<groupId>org.tmatesoft.svnkit</groupId>
148106
<artifactId>svnkit-cli</artifactId>
149-
<version>1.9.2</version>
107+
<version>${svnkit.version}</version>
150108
<scope>test</scope>
151109
</dependency>
152110
<dependency>
153111
<groupId>org.jenkins-ci.plugins.workflow</groupId>
154112
<artifactId>workflow-step-api</artifactId>
155-
<version>${workflow-step-api-plugin.version}</version>
156113
<classifier>tests</classifier>
157114
<scope>test</scope>
158115
</dependency>
159116
<dependency>
160117
<groupId>org.jenkins-ci.plugins.workflow</groupId>
161118
<artifactId>workflow-cps</artifactId>
162-
<version>2.29</version>
163119
<scope>test</scope>
164-
<exclusions>
165-
<exclusion>
166-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
167-
<artifactId>workflow-scm-step</artifactId>
168-
</exclusion>
169-
</exclusions>
170120
</dependency>
171121
<dependency>
172122
<groupId>org.jenkins-ci.plugins.workflow</groupId>
173123
<artifactId>workflow-multibranch</artifactId>
174-
<version>2.14</version>
175124
<scope>test</scope>
176-
<exclusions>
177-
<exclusion>
178-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
179-
<artifactId>workflow-scm-step</artifactId>
180-
</exclusion>
181-
</exclusions>
182125
</dependency>
183126
<dependency>
184127
<groupId>org.jenkins-ci.plugins</groupId>
185128
<artifactId>cloudbees-folder</artifactId>
186-
<version>5.18</version>
187129
<scope>test</scope>
188130
</dependency>
189131
<dependency>
190132
<groupId>org.jenkins-ci.plugins.workflow</groupId>
191133
<artifactId>workflow-job</artifactId>
192-
<version>2.12</version>
193134
<scope>test</scope>
194135
</dependency>
195136
<dependency>
196137
<groupId>org.jenkins-ci.plugins.workflow</groupId>
197138
<artifactId>workflow-basic-steps</artifactId>
198-
<version>2.4</version>
199139
<scope>test</scope>
200140
</dependency>
201141
<dependency>
202142
<groupId>org.jenkins-ci.plugins.workflow</groupId>
203143
<artifactId>workflow-durable-task-step</artifactId>
204-
<version>2.11</version>
205144
<scope>test</scope>
206145
</dependency>
207146
<dependency>
208147
<groupId>org.jenkins-ci.plugins.workflow</groupId>
209148
<artifactId>workflow-support</artifactId>
210-
<version>${workflow-support-plugin.version}</version>
211149
<scope>test</scope>
212150
</dependency>
213151
<dependency>
214152
<groupId>org.jenkins-ci.plugins.workflow</groupId>
215153
<artifactId>workflow-support</artifactId>
216-
<version>${workflow-support-plugin.version}</version>
217154
<classifier>tests</classifier>
218155
<scope>test</scope>
219156
</dependency>
220157
<dependency>
221158
<groupId>org.jenkins-ci.plugins</groupId>
222159
<artifactId>mercurial</artifactId>
223-
<version>1.54</version>
160+
<version>2.12</version>
224161
<scope>test</scope>
225-
<exclusions>
226-
<exclusion> <!-- git-client has a newer one -->
227-
<groupId>com.jcraft</groupId>
228-
<artifactId>jsch</artifactId>
229-
</exclusion>
230-
</exclusions>
231162
</dependency>
232163
<dependency>
233164
<groupId>org.jenkins-ci.plugins</groupId>
234165
<artifactId>junit</artifactId>
235-
<version>1.20</version>
236166
<scope>test</scope>
237167
</dependency>
238168
<dependency>
239169
<groupId>org.jenkins-ci.plugins</groupId>
240170
<artifactId>structs</artifactId>
241-
<version>1.10</version>
242171
<scope>test</scope>
243172
</dependency>
244173
</dependencies>

‎src/test/java/org/jenkinsci/plugins/workflow/steps/scm/SCMStepTest.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,17 @@
5757
import org.junit.Test;
5858
import static org.junit.Assert.*;
5959
import org.junit.ClassRule;
60+
import org.junit.FixMethodOrder;
6061
import org.junit.Rule;
62+
import org.junit.runners.MethodSorters;
6163
import org.jvnet.hudson.test.BuildWatcher;
6264
import org.jvnet.hudson.test.Issue;
6365
import org.jvnet.hudson.test.RestartableJenkinsRule;
6466
import org.jvnet.hudson.test.TestExtension;
6567
import org.kohsuke.stapler.DataBoundConstructor;
6668
import org.xml.sax.SAXException;
6769

70+
@FixMethodOrder(MethodSorters.NAME_ASCENDING) // TODO: checkoutsRestored and gitChangelogSmokes fail if they run after the other tests.
6871
public class SCMStepTest {
6972

7073
@ClassRule public static BuildWatcher buildWatcher = new BuildWatcher();
@@ -195,16 +198,12 @@ public void scmVars() throws Exception {
195198

196199
@Test public void gitChangelogSmokes() {
197200
rr.then(r -> {
201+
sampleGitRepo.init(); // GitSampleRepoRule provides default user gits@mplereporule
198202
WorkflowJob p = r.jenkins.createProject(WorkflowJob.class, "p");
199203
p.setDefinition(new CpsFlowDefinition(
200204
"node() {\n" +
201-
" checkout(scm: [\n" +
202-
" $class: 'GitSCM',\n" +
203-
" branches: [[name: '*/master']],\n" +
204-
" userRemoteConfigs: [[url: '" + sampleGitRepo.fileUrl() + "']]\n" +
205-
" ])\n" +
206-
"}", true));
207-
sampleGitRepo.init(); // GitSampleRepoRule provides default user gits@mplereporule
205+
" git($/" + sampleGitRepo + "/$)\n" +
206+
"}", true));
208207
sampleGitRepo.write("foo", "bar");
209208
sampleGitRepo.git("add", "foo");
210209
sampleGitRepo.git("commit", "-m", "Initial commit");

0 commit comments

Comments
 (0)