Skip to content

Migrate from EE 8 to EE 9 #167

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

Merged
daniel-beck merged 2 commits into from
Jan 27, 2025
Merged

Migrate from EE 8 to EE 9 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4965d8
Migrate from EE 8 to EE 9
basil Jan 16, 2025
0396171
https://github.com/jenkinsci/matrix-auth-plugin/pull/167#discussion_r…
basil Jan 16, 2025
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
6 changes: 2 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
buildPlugin(useContainerAgent: true,
configurations: [
[platform: 'linux', jdk: 11],
[platform: 'windows', jdk: 11],
[platform: 'linux', jdk: 17],
[platform: 'linux', jdk: 21]
[platform: 'linux', jdk: 21],
[platform: 'windows', jdk: 17],
])
10 changes: 6 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.88</version>
<version>5.5</version>
</parent>
<artifactId>matrix-auth</artifactId>
<version>${revision}${changelist}</version>
Expand All @@ -28,16 +28,18 @@
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<hpi.compatibleSinceVersion>3.2</hpi.compatibleSinceVersion>
<jenkins.version>2.426.3</jenkins.version>
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
<jenkins.baseline>2.479</jenkins.baseline>
<jenkins.version>${jenkins.baseline}.1</jenkins.version>
<spotless.check.skip>false</spotless.check.skip>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.426.x</artifactId>
<version>3208.vb_21177d4b_cd9</version>
<artifactId>bom-${jenkins.baseline}.x</artifactId>
<version>3893.v213a_42768d35</version>
Copy link
Member

@daniel-beck daniel-beck Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Has jenkinsci/cloudbees-folder-plugin#444 which addresses #163 (comment)

<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/com/cloudbees/hudson/plugins/folder/properties/AuthorizationMatrixProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.verb.GET;

/**
Expand Down Expand Up @@ -167,7 +167,7 @@ public PermissionScope getPermissionScope() {
}

@Override
public AuthorizationMatrixProperty newInstance(StaplerRequest req, JSONObject formData) throws FormException {
public AuthorizationMatrixProperty newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
return createNewInstance(req, formData, true);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/security/AuthorizationMatrixProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;
import org.kohsuke.stapler.verb.GET;

/**
Expand Down Expand Up @@ -205,7 +205,7 @@ public PermissionScope getPermissionScope() {
}

@Override
public JobProperty<?> newInstance(StaplerRequest req, JSONObject formData) throws FormException {
public JobProperty<?> newInstance(StaplerRequest2 req, JSONObject formData) throws FormException {
return createNewInstance(req, formData, true);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/security/GlobalMatrixAuthorizationStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
import org.kohsuke.accmod.restrictions.DoNotUse;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

/**
* Role-based authorization via a matrix.
Expand Down Expand Up @@ -162,7 +162,7 @@ public String getDisplayName() {
}

@Override
public AuthorizationStrategy newInstance(StaplerRequest req, @NonNull JSONObject formData)
public AuthorizationStrategy newInstance(StaplerRequest2 req, @NonNull JSONObject formData)
throws FormException {
// TODO Is there a way to pull this up into AuthorizationContainerDescriptor and share code with
// AuthorizationPropertyDescriptor?
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationMatrixNodeProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

public class AuthorizationMatrixNodeProperty extends NodeProperty<Node> implements AuthorizationProperty {

Expand Down Expand Up @@ -164,7 +164,7 @@ public PermissionScope getPermissionScope() {
}

@Override
public AuthorizationMatrixNodeProperty newInstance(StaplerRequest req, @NonNull JSONObject formData)
public AuthorizationMatrixNodeProperty newInstance(StaplerRequest2 req, @NonNull JSONObject formData)
throws FormException {
return createNewInstance(req, formData, false);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/matrixauth/AuthorizationPropertyDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.jenkinsci.plugins.matrixauth.inheritance.InheritanceStrategy;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerRequest2;

/**
* Interface with default methods common to all authorization related property descriptors.
Expand All @@ -48,7 +48,7 @@ public interface AuthorizationPropertyDescriptor<T extends AuthorizationProperty

T create();

default T createNewInstance(StaplerRequest req, JSONObject formData, boolean hasOptionalWrap)
default T createNewInstance(StaplerRequest2 req, JSONObject formData, boolean hasOptionalWrap)
throws Descriptor.FormException {
if (hasOptionalWrap) {
formData = formData.getJSONObject("useProjectSecurity");
Expand Down
Loading