Skip to content

Commit 294ab2e

Browse files
chore: renovate plugin (#202)
* chore: renovate plugin dependencies * chore: replace dependabot with renovate-bot * chore: rephrase test TODO as it fails "style-check" 🙄 * chore: sure, complain about a "style issue" that existed for ages 🙄 --------- Co-authored-by: K3rnelPan1c <[email protected]>
1 parent 63594e9 commit 294ab2e

File tree

6 files changed

+60
-16
lines changed

6 files changed

+60
-16
lines changed
File renamed without changes.

.github/renovate.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:base",
5+
":semanticCommits",
6+
":semanticCommitScope(deps)",
7+
":enableVulnerabilityAlertsWithLabel(security)",
8+
"helpers:pinGitHubActionDigests",
9+
"schedule:weekly"
10+
],
11+
"dependencyDashboard": true,
12+
"rebaseWhen": "conflicted",
13+
"addLabels": ["dependencies"],
14+
"packageRules": [
15+
{
16+
"description": "Add the ci and github-actions GitHub label to GitHub Action bump PRs",
17+
"matchManagers": ["github-actions"],
18+
"addLabels": ["ci", "github-actions"],
19+
"semanticCommitType": "build"
20+
},
21+
{
22+
"description": "Add the java GitHub label to Maven bump PRs",
23+
"matchDatasources": ["maven"],
24+
"addLabels": ["java"]
25+
},
26+
{
27+
"description": "Group GitHub Action bumps to one PR as long as they have no major jump",
28+
"matchManagers": ["github-actions"],
29+
"groupName": "CI dependencies",
30+
"groupSlug": "ci-dependencies",
31+
"matchUpdateTypes": [
32+
"minor",
33+
"patch"
34+
]
35+
}
36+
]
37+
}

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
buildPlugin(useContainerAgent: true, configurations: [
2-
[ platform: "linux", jdk: "8" ],
3-
[ platform: "linux", jdk: "11", javaLevel: "8" ]
2+
[ platform: "linux", jdk: "11" ],
3+
[ platform: "linux", jdk: "17" ]
44
])

pom.xml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>4.47</version>
8+
<version>4.66</version>
99
<relativePath />
1010
</parent>
1111

1212
<properties>
13-
<revision>1.6.4</revision>
13+
<revision>1.7.0</revision>
1414
<changelist>-SNAPSHOT</changelist>
1515
<!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
16-
<jenkins.version>2.332.1</jenkins.version>
17-
<bom.artifactId>2.332.x</bom.artifactId>
18-
<bom.version>1595.v8c71c13cc3a_9</bom.version>
19-
<java.level>8</java.level>
16+
<jenkins.version>2.387.1</jenkins.version>
17+
<bom.artifactId>2.387.x</bom.artifactId>
18+
<bom.version>2143.ve4c3c9ec790a</bom.version>
19+
<java.level>11</java.level>
2020
<!--
2121
Other properties you may want to use:
2222
~ jenkins-test-harness.version: Jenkins Test Harness version you use to test the plugin. For Jenkins version >= 1.580.1 use JTH 2.0 or higher.
@@ -91,18 +91,25 @@
9191
</dependency>
9292
<dependency>
9393
<groupId>io.jenkins.plugins</groupId>
94-
<artifactId>okhttp-api</artifactId>
95-
<version>3.14.9</version>
94+
<artifactId>commons-text-api</artifactId>
9695
</dependency>
9796
<dependency>
98-
<groupId>com.jayway.jsonpath</groupId>
99-
<artifactId>json-path</artifactId>
100-
<version>2.7.0</version>
97+
<groupId>io.jenkins.plugins</groupId>
98+
<artifactId>commons-lang3-api</artifactId>
10199
</dependency>
102100
<dependency>
103101
<groupId>io.jenkins.plugins</groupId>
104102
<artifactId>jquery3-api</artifactId>
105-
<version>3.6.0-4</version>
103+
</dependency>
104+
<dependency>
105+
<groupId>io.jenkins.plugins</groupId>
106+
<artifactId>okhttp-api</artifactId>
107+
<version>3.14.9</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>com.jayway.jsonpath</groupId>
111+
<artifactId>json-path</artifactId>
112+
<version>2.8.0</version>
106113
</dependency>
107114
<dependency>
108115
<groupId>io.jenkins.plugins</groupId>

src/main/java/io/jenkins/plugins/restlistparam/util/PathExpressionValidationUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static FormValidation doCheckXPathExpression(final String expression) {
2121
xpath.compile(expression);
2222
return FormValidation.ok();
2323
}
24-
catch (XPathExpressionException | NullPointerException ignore) {
24+
catch (XPathExpressionException ignore) {
2525
return FormValidation.error(Messages.RLP_PathExpressionValidationUtil_FormErr_xPath());
2626
}
2727
}

src/test/java/io/jenkins/plugins/restlistparam/RestValueServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import java.util.List;
1212

13-
// TODO more unit tests here (preferably replace integration tests)
13+
// Task for later: more unit tests here (preferably replace integration tests)
1414
public class RestValueServiceTest {
1515
@Test
1616
public void successfulGetIntegrationTest() {

0 commit comments

Comments
 (0)