Skip to content

feat(java): Require Jenkins core 2.492.3 and Java 17 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gounthar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(java): Require Jenkins core 2.492.3 and Java 17 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.4</version>
<version>5.17</version>
<relativePath />
</parent>

<properties>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.492</jenkins.baseline>
<!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
<jenkins.version>2.235.1</jenkins.version>
<java.level>8</java.level>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>

Expand Down Expand Up @@ -42,7 +41,7 @@
</licenses>

<scm>
<connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
<tag>${scmTag}</tag>
Expand All @@ -55,7 +54,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<!-- jdk version -->
<source>1.8</source>
Expand All @@ -65,21 +63,13 @@
</plugins>
</build>

<developers>
<developer>
<id>RoyalSloth</id>
<name>RoyalSloth</name>
<url>https://www.royalsloth.eu/products/depbuilder/</url>
</developer>
</developers>

<dependencyManagement>
<dependencies>
<dependency>
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.235.x</artifactId>
<version>11</version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>4890.vfca_82c6741a_d</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -113,7 +103,6 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.7.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/eu/royalsloth/depbuilder/jenkins/DslBuild.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import jenkins.model.ParameterizedJobMixIn;
import net.sf.json.JSONObject;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.StaplerResponse2;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.verb.POST;

Expand Down Expand Up @@ -189,7 +189,7 @@ public JSONObject getDslBuild() {
* @param job name of the job that should be built
*/
@POST
public void doStartPartialBuild(StaplerRequest req, StaplerResponse rsp,
public void doStartPartialBuild(StaplerRequest2 req, StaplerResponse2 rsp,
@QueryParameter String job) throws IOException {
JenkinsUtil.getJenkins().checkPermission(Jenkins.ADMINISTER);
if (job == null || job.isEmpty()) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/eu/royalsloth/depbuilder/jenkins/DslProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.kohsuke.stapler.verb.POST;

import javax.annotation.CheckForNull;
import javax.servlet.ServletException;
import jakarta.servlet.ServletException;
import java.io.IOException;
import java.util.Optional;
import java.util.*;
Expand Down Expand Up @@ -144,8 +144,8 @@ public boolean getTableBasedRendering() {
// For some reason I cannot get it to work via our custom doCheck method in the project descriptor.
@POST
@Override
public synchronized void doConfigSubmit(StaplerRequest req,
StaplerResponse rsp) throws IOException, ServletException, Descriptor.FormException {
public synchronized void doConfigSubmit(StaplerRequest2 req,
StaplerResponse2 rsp) throws IOException, ServletException, Descriptor.FormException {
JenkinsUtil.getJenkins().checkPermission(Jenkins.ADMINISTER);

JSONObject json = req.getSubmittedForm();
Expand Down