Skip to content

Commit 6367d3d

Browse files
authored
Merge pull request #231 from basil/jakarta
Migrate from EE 8 to EE 9
2 parents 216a06b + 549a840 commit 6367d3d

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pom.xml

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

@@ -43,8 +43,8 @@
4343
<changelist>999999-SNAPSHOT</changelist>
4444
<gitHubRepo>jenkinsci/simple-theme-plugin</gitHubRepo>
4545
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
46-
<jenkins.baseline>2.440</jenkins.baseline>
47-
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
46+
<jenkins.baseline>2.479</jenkins.baseline>
47+
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
4848
<hpi.compatibleSinceVersion>171</hpi.compatibleSinceVersion>
4949
<spotless.check.skip>false</spotless.check.skip>
5050
</properties>
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>io.jenkins.tools.bom</groupId>
5656
<artifactId>bom-${jenkins.baseline}.x</artifactId>
57-
<version>3234.v5ca_5154341ef</version>
57+
<version>3850.vb_c5319efa_e29</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>

src/main/java/org/codefirst/SimpleThemeDecorator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.kohsuke.stapler.Ancestor;
2121
import org.kohsuke.stapler.DataBoundSetter;
2222
import org.kohsuke.stapler.Stapler;
23-
import org.kohsuke.stapler.StaplerRequest;
23+
import org.kohsuke.stapler.StaplerRequest2;
2424

2525
@Extension
2626
@Symbol("simpleTheme")
@@ -46,7 +46,7 @@ public SimpleThemeDecorator() {
4646
}
4747

4848
@Override
49-
public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
49+
public boolean configure(StaplerRequest2 req, JSONObject formData) throws FormException {
5050
elements.clear();
5151
req.bindJSON(this, formData);
5252
save();
@@ -146,7 +146,7 @@ public String getHeaderHtml() {
146146
* @return true if it is okay to inject CSS
147147
*/
148148
public boolean shouldInjectCss() {
149-
StaplerRequest req = Stapler.getCurrentRequest();
149+
StaplerRequest2 req = Stapler.getCurrentRequest2();
150150
if (req == null) {
151151
return false;
152152
}

0 commit comments

Comments
 (0)