Skip to content

Commit af3d91f

Browse files
chontonchonton
committedJan 26, 2024
updates for transfer to jenkins
·
54.v71962f37a_41630.vefed798080d3
1 parent ef3b260 commit af3d91f

File tree

5 files changed

+207
-16
lines changed

5 files changed

+207
-16
lines changed
 

Diff for: ‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @jenkinsci/json-editor-choice-plugin-developers
1+
* @jenkinsci/json-editor-parameter-plugin-developers

Diff for: ‎.github/release-drafter.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
_extends: .github
2-
tag-template: json-editor-choice-$NEXT_MINOR_VERSION
2+
tag-template: json-editor-parameter-plugin-$NEXT_MINOR_VERSION

Diff for: ‎pom.xml

+14-11
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.65</version>
8+
<version>4.77</version>
99
<relativePath />
1010
</parent>
1111

1212
<groupId>io.jenkins.plugins</groupId>
13-
<artifactId>json-editor-parameter</artifactId>
13+
<artifactId>json-editor-parameter-plugin</artifactId>
1414
<version>${revision}${changelist}</version>
1515
<packaging>hpi</packaging>
1616

1717
<name>Json Editor Parameter</name>
1818

19-
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
19+
<url>https://github.com/jenkinsci/${project.artifactId}</url>
2020
<inceptionYear>2023</inceptionYear>
2121

2222
<licenses>
@@ -34,13 +34,14 @@
3434
</scm>
3535

3636
<properties>
37-
<revision>1.0</revision>
3837
<changelist>-SNAPSHOT</changelist>
39-
<maven.version>3.8.1</maven.version>
38+
<gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
4039

4140
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
42-
<jenkins.version>2.387.3</jenkins.version>
43-
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
41+
<jenkins.version>2.426.1</jenkins.version>
42+
<jetty.version>9.4.53.v20231009</jetty.version>
43+
<maven.version>3.8.1</maven.version>
44+
<revision>1.0</revision>
4445
<spotless.check.skip>false</spotless.check.skip>
4546
</properties>
4647

@@ -49,8 +50,8 @@
4950
<dependency>
5051
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
5152
<groupId>io.jenkins.tools.bom</groupId>
52-
<artifactId>bom-2.387.x</artifactId>
53-
<version>2258.v522c10b_d4695</version>
53+
<artifactId>bom-2.426.x</artifactId>
54+
<version>2746.vb_79a_1d3e7b_c8</version>
5455
<type>pom</type>
5556
<scope>import</scope>
5657
</dependency>
@@ -95,6 +96,7 @@
9596
<artifactId>workflow-job</artifactId>
9697
<scope>test</scope>
9798
</dependency>
99+
98100
</dependencies>
99101

100102
<repositories>
@@ -118,6 +120,7 @@
118120
<plugin>
119121
<groupId>com.diffplug.spotless</groupId>
120122
<artifactId>spotless-maven-plugin</artifactId>
123+
<version>2.43.0</version>
121124
<executions>
122125
<execution>
123126
<goals>
@@ -131,7 +134,7 @@
131134
<plugin>
132135
<groupId>org.apache.maven.plugins</groupId>
133136
<artifactId>maven-enforcer-plugin</artifactId>
134-
<version>3.3.0</version>
137+
<version>3.4.1</version>
135138
<executions>
136139
<execution>
137140
<id>enforce-maven</id>
@@ -156,7 +159,7 @@
156159
<plugin>
157160
<groupId>org.apache.maven.plugins</groupId>
158161
<artifactId>maven-pmd-plugin</artifactId>
159-
<version>3.21.0</version>
162+
<version>3.21.2</version>
160163
<configuration>
161164
<compileSourceRoots>src/main/java</compileSourceRoots>
162165
</configuration>

Diff for: ‎pom.xml.bak

+188
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
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"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<groupId>org.jenkins-ci.plugins</groupId>
8+
<artifactId>plugin</artifactId>
9+
<version>4.77</version>
10+
<relativePath/>
11+
</parent>
12+
13+
<groupId>io.jenkins.plugins</groupId>
14+
<artifactId>json-editor-parameter</artifactId>
15+
<version>${revision}${changelist}</version>
16+
<packaging>hpi</packaging>
17+
18+
<name>Json Editor Parameter</name>
19+
20+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
21+
<inceptionYear>2023</inceptionYear>
22+
23+
<licenses>
24+
<license>
25+
<name>MIT License</name>
26+
<url>https://opensource.org/license/mit/</url>
27+
</license>
28+
</licenses>
29+
30+
<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false"
31+
child.scm.url.inherit.append.path="false">
32+
<connection>scm:git:https://github.com/${gitHubRepo}</connection>
33+
<developerConnection>scm:git:https://github.com/${gitHubRepo}</developerConnection>
34+
<tag>${scmTag}</tag>
35+
<url>https://github.com/${gitHubRepo}</url>
36+
</scm>
37+
38+
<properties>
39+
<revision>1.0</revision>
40+
<changelist>-SNAPSHOT</changelist>
41+
<maven.version>3.8.1</maven.version>
42+
43+
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
44+
<jenkins.version>2.426.1</jenkins.version>
45+
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
46+
<spotless.check.skip>false</spotless.check.skip>
47+
</properties>
48+
49+
<dependencyManagement>
50+
<dependencies>
51+
<dependency>
52+
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
53+
<groupId>io.jenkins.tools.bom</groupId>
54+
<artifactId>bom-2.426.x</artifactId>
55+
<version>2746.vb_79a_1d3e7b_c8</version>
56+
<type>pom</type>
57+
<scope>import</scope>
58+
</dependency>
59+
</dependencies>
60+
</dependencyManagement>
61+
62+
<dependencies>
63+
64+
<dependency>
65+
<groupId>org.projectlombok</groupId>
66+
<artifactId>lombok</artifactId>
67+
<version>1.18.28</version>
68+
<scope>provided</scope>
69+
</dependency>
70+
71+
<dependency>
72+
<groupId>org.htmlunit</groupId>
73+
<artifactId>htmlunit</artifactId>
74+
<version>3.10.0</version>
75+
<scope>test</scope>
76+
</dependency>
77+
78+
<dependency>
79+
<groupId>org.jenkins-ci.plugins</groupId>
80+
<artifactId>pipeline-input-step</artifactId>
81+
<scope>test</scope>
82+
</dependency>
83+
84+
<dependency>
85+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
86+
<artifactId>workflow-basic-steps</artifactId>
87+
<scope>test</scope>
88+
</dependency>
89+
90+
<dependency>
91+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
92+
<artifactId>workflow-cps</artifactId>
93+
<scope>test</scope>
94+
</dependency>
95+
96+
<dependency>
97+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
98+
<artifactId>workflow-durable-task-step</artifactId>
99+
<scope>test</scope>
100+
</dependency>
101+
102+
<dependency>
103+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
104+
<artifactId>workflow-job</artifactId>
105+
<scope>test</scope>
106+
</dependency>
107+
108+
</dependencies>
109+
110+
<repositories>
111+
<repository>
112+
<id>repo.jenkins-ci.org</id>
113+
<url>https://repo.jenkins-ci.org/public/</url>
114+
</repository>
115+
</repositories>
116+
117+
<pluginRepositories>
118+
<pluginRepository>
119+
<id>repo.jenkins-ci.org</id>
120+
<url>https://repo.jenkins-ci.org/public/</url>
121+
</pluginRepository>
122+
</pluginRepositories>
123+
124+
<build>
125+
126+
<plugins>
127+
128+
<plugin>
129+
<groupId>com.diffplug.spotless</groupId>
130+
<artifactId>spotless-maven-plugin</artifactId>
131+
<version>2.43.0</version>
132+
<executions>
133+
<execution>
134+
<goals>
135+
<goal>apply</goal>
136+
</goals>
137+
<phase>process-sources</phase>
138+
</execution>
139+
</executions>
140+
</plugin>
141+
142+
<plugin>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-enforcer-plugin</artifactId>
145+
<version>3.4.1</version>
146+
<executions>
147+
<execution>
148+
<id>enforce-maven</id>
149+
<goals>
150+
<goal>enforce</goal>
151+
</goals>
152+
<configuration>
153+
<rules>
154+
<requireJavaVersion>
155+
<version>[${maven.compiler.release},)</version>
156+
</requireJavaVersion>
157+
<requireMavenVersion>
158+
<version>[${maven.version},)</version>
159+
</requireMavenVersion>
160+
<dependencyConvergence/>
161+
</rules>
162+
</configuration>
163+
</execution>
164+
</executions>
165+
</plugin>
166+
167+
<plugin>
168+
<groupId>org.apache.maven.plugins</groupId>
169+
<artifactId>maven-pmd-plugin</artifactId>
170+
<version>3.21.2</version>
171+
<configuration>
172+
<compileSourceRoots>src/main/java</compileSourceRoots>
173+
</configuration>
174+
<executions>
175+
<execution>
176+
<goals>
177+
<goal>cpd-check</goal>
178+
<goal>check</goal>
179+
</goals>
180+
<phase>process-classes</phase>
181+
</execution>
182+
</executions>
183+
</plugin>
184+
185+
</plugins>
186+
</build>
187+
188+
</project>

Diff for: ‎src/test/java/io/jenkins/plugins/json_editor_parameter/JsonEditorParameterDefinitionTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package io.jenkins.plugins.json_editor_parameter;
22

3-
import com.gargoylesoftware.htmlunit.html.HtmlElement;
4-
import com.gargoylesoftware.htmlunit.html.HtmlPage;
5-
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
63
import hudson.model.FreeStyleProject;
74
import hudson.model.Job;
85
import hudson.model.ParametersDefinitionProperty;
96
import java.net.URL;
107
import java.nio.file.Files;
118
import java.nio.file.Paths;
9+
import org.htmlunit.html.HtmlElement;
10+
import org.htmlunit.html.HtmlPage;
11+
import org.htmlunit.html.HtmlTextInput;
1212
import org.junit.Rule;
1313
import org.junit.Test;
1414
import org.junit.jupiter.api.Assertions;

0 commit comments

Comments
 (0)
Please sign in to comment.