Skip to content
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.

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

[JENKINS-73278] Migrate core from EE 8 to EE 9 #9672

Merged
merged 62 commits into from
Sep 3, 2024
Merged
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
fdc46ed
[JENKINS-73278] Migrate core from EE 8 to EE 9
basil Aug 27, 2024
ac39015
Merge branch 'master' into jakarta
basil Aug 28, 2024
066b83e
New incremental
basil Aug 28, 2024
18e6f92
Fix deprecated method
basil Aug 30, 2024
8c73deb
Merge branch 'master' into jakarta
basil Aug 30, 2024
1bdf821
Update incrementals
basil Aug 30, 2024
159977e
Merge branch 'master' into jakarta
basil Aug 30, 2024
56524fa
Merge branch 'master' into jakarta
basil Sep 1, 2024
8e348cc
Update core/src/main/java/hudson/security/SecurityRealm.java
basil Sep 2, 2024
ec2de4c
Update core/src/main/java/hudson/model/Job.java
basil Sep 2, 2024
9e66c79
Update core/src/main/java/hudson/model/Descriptor.java
basil Sep 2, 2024
fd88bb5
Update core/src/main/java/hudson/model/Api.java
basil Sep 2, 2024
da5da53
Update core/src/main/java/hudson/model/Api.java
basil Sep 2, 2024
ebe3c01
Update core/src/main/java/hudson/model/Actionable.java
basil Sep 2, 2024
61129e7
Update core/src/main/java/jenkins/model/Jenkins.java
basil Sep 2, 2024
6f537e5
Update core/src/main/java/jenkins/model/Jenkins.java
basil Sep 2, 2024
d74b057
Update core/src/main/java/hudson/PluginManager.java
basil Sep 2, 2024
cc2d615
Update core/src/main/java/hudson/util/Graph.java
basil Sep 2, 2024
abd2c08
Update core/src/main/java/hudson/util/Graph.java
basil Sep 2, 2024
e6ad0e3
Update core/src/main/java/hudson/search/Search.java
basil Sep 2, 2024
9e6a1a7
Update core/src/main/java/jenkins/model/Jenkins.java
basil Sep 2, 2024
829894e
Update core/src/main/java/jenkins/model/Jenkins.java
basil Sep 2, 2024
93033e1
Update core/src/main/java/jenkins/model/ModelObjectWithChildren.java
basil Sep 2, 2024
133504b
Update core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java
basil Sep 2, 2024
41f79c7
Update core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
basil Sep 2, 2024
4039c7a
Update core/src/main/java/hudson/console/AnnotatedLargeText.java
basil Sep 2, 2024
e7025d0
Update core/src/main/java/hudson/model/AbstractItem.java
basil Sep 2, 2024
0c219e9
Update core/src/main/java/hudson/model/AbstractItem.java
basil Sep 2, 2024
ce2a6b7
Update core/src/main/java/hudson/Plugin.java
basil Sep 2, 2024
8a8be78
Update core/src/main/java/hudson/scm/AbstractScmTagAction.java
basil Sep 2, 2024
4ca29c4
Update core/src/main/java/hudson/model/AbstractItem.java
basil Sep 2, 2024
ae770e3
Update core/src/main/java/hudson/model/Run.java
basil Sep 2, 2024
addd785
Update core/src/main/java/hudson/model/Run.java
basil Sep 2, 2024
22d0ca6
Update core/src/main/java/hudson/model/UpdateCenter.java
basil Sep 2, 2024
f971ab6
Update core/src/main/java/hudson/model/View.java
basil Sep 2, 2024
5aaba6f
Update core/src/main/java/hudson/model/View.java
basil Sep 2, 2024
179ea54
Update core/src/main/java/hudson/model/View.java
basil Sep 2, 2024
604db9f
Add imports
basil Sep 2, 2024
b68c552
https://github.com/jenkinsci/jenkins/pull/9672#issuecomment-2324945196
basil Sep 2, 2024
ff8986f
Fast incremental
basil Aug 12, 2024
a26e478
Revert "Update core/src/main/java/hudson/model/View.java"
basil Sep 2, 2024
497b651
Revert "Fast incremental"
basil Sep 2, 2024
d923825
Different CSRF fix
basil Sep 2, 2024
4f67784
Fast incremental
basil Aug 12, 2024
b536707
Revert "Fast incremental"
basil Sep 2, 2024
c3ec4a1
Released versions
basil Sep 3, 2024
520776a
https://github.com/jenkinsci/jenkins/pull/9672#issuecomment-2326277011
basil Sep 3, 2024
cc07404
Fix build
basil Sep 3, 2024
3a6a576
Fast incremental
basil Aug 12, 2024
4f31577
Revert "Fast incremental"
basil Sep 3, 2024
fe998fb
Update core/src/main/java/hudson/model/Descriptor.java
basil Sep 3, 2024
75120d8
https://github.com/jenkinsci/jenkins/pull/9672#discussion_r1738887508
basil Sep 3, 2024
6315119
https://github.com/jenkinsci/jenkins/pull/9672#discussion_r1742018013
basil Sep 3, 2024
f735fdc
https://github.com/jenkinsci/jenkins/pull/9672#discussion_r1742029487
basil Sep 3, 2024
de29558
https://github.com/jenkinsci/jenkins/pull/9672#discussion_r1742071739
basil Sep 3, 2024
10f333f
https://github.com/jenkinsci/jenkins/pull/9672#discussion_r1742082679
basil Sep 3, 2024
96797e9
https://github.com/jenkinsci/jenkins/pull/9672#discussion_r1742273929
basil Sep 3, 2024
715c02c
More fixes
basil Sep 3, 2024
6cae674
The original problem was issueCrumb (probably validateCrumb too)
daniel-beck Sep 3, 2024
a42ed07
Two more calls to wrap
basil Sep 3, 2024
2a4870c
Fast incremental
basil Aug 12, 2024
90659fe
Revert "Fast incremental"
basil Sep 3, 2024
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
Prev Previous commit
Next Next commit
Revert "Update core/src/main/java/hudson/model/View.java"
This reverts commit 5aaba6f.
  • Loading branch information
basil committed Sep 2, 2024
commit a26e478f466c60e5bf2b6e094f06fab5a83f1520
1 change: 0 additions & 1 deletion core/src/main/java/hudson/model/View.java
Original file line number Diff line number Diff line change
@@ -678,188 +678,187 @@
*/
@RequirePOST
public synchronized void doSubmitDescription(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
if (Util.isOverridden(View.class, getClass(), "doSubmitDescription", StaplerRequest.class, StaplerResponse.class)) {
try {
doSubmitDescription(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
} catch (javax.servlet.ServletException e) {
throw ServletExceptionWrapper.toJakartaServletException(e);
}
} else {
doSubmitDescriptionImpl(req, rsp);
}
}

/**
* @deprecated use {@link #doSubmitDescription(StaplerRequest2, StaplerResponse2)}
*/
@Deprecated
@StaplerNotDispatchable
public synchronized void doSubmitDescription(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
doSubmitDescriptionImpl(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
}

private void doSubmitDescriptionImpl(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException {
checkPermission(CONFIGURE);

description = req.getParameter("description");
save();
rsp.sendRedirect("."); // go to the top page
}

/**
* Accepts submission from the configuration page.
*
* Subtypes should override the {@link #submit(StaplerRequest2)} method.
*/
@POST
public final synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
checkPermission(CONFIGURE);

submit(req);

var json = req.getSubmittedForm();
setDescription(json.optString("description"));
setFilterExecutors(json.optBoolean("filterExecutors"));
setFilterQueue(json.optBoolean("filterQueue"));
rename(req.getParameter("name"));

getProperties().rebuild(req, json, getApplicablePropertyDescriptors());

save();

FormApply.success("../" + Util.rawEncode(name)).generateResponse(req, rsp, this);
}

/**
* Handles the configuration submission.
*
* Load view-specific properties here.
*/
protected /* abstract */ void submit(StaplerRequest2 req) throws IOException, ServletException, FormException {
if (Util.isOverridden(View.class, getClass(), "submit", StaplerRequest.class)) {
try {
submit(StaplerRequest.fromStaplerRequest2(req));
} catch (javax.servlet.ServletException e) {
throw ServletExceptionWrapper.toJakartaServletException(e);
}
} else {
throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+ View.class.getSimpleName() + ".submit methods");
}
}

/**
* @deprecated use {@link #submit(StaplerRequest2)}
*/
@Deprecated
protected void submit(StaplerRequest req) throws IOException, javax.servlet.ServletException, FormException {
if (Util.isOverridden(View.class, getClass(), "submit", StaplerRequest2.class)) {
try {
submit(StaplerRequest.toStaplerRequest2(req));
} catch (ServletException e) {
throw ServletExceptionWrapper.fromJakartaServletException(e);
}
} else {
throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+ View.class.getSimpleName() + ".submit methods");
}
}


/**
* Deletes this view.
*/
@RequirePOST
public synchronized void doDoDelete(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
checkPermission(DELETE);

owner.deleteView(this);

rsp.sendRedirect2(req.getContextPath() + "/" + owner.getUrl());
}


/**
* Creates a new {@link Item} in this collection.
*
* <p>
* This method should call {@link ModifiableItemGroup#doCreateItem(StaplerRequest2, StaplerResponse2)}
* and then add the newly created item to this view.
*
* @return
* null if fails.
* @since TODO
*/
@StaplerNotDispatchable
public /* abstract */ Item doCreateItem(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException {
if (Util.isOverridden(View.class, getClass(), "doCreateItem", StaplerRequest.class, StaplerResponse.class)) {
try {
return doCreateItem(StaplerRequest.fromStaplerRequest2(req), StaplerResponse.fromStaplerResponse2(rsp));
} catch (javax.servlet.ServletException e) {
throw ServletExceptionWrapper.toJakartaServletException(e);
}
} else {
throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+ View.class.getSimpleName() + ".doCreateItem methods");
}
}

/**
* @deprecated use {@link #doCreateItem(StaplerRequest2, StaplerResponse2)}
*/
@Deprecated
@StaplerNotDispatchable
public Item doCreateItem(StaplerRequest req, StaplerResponse rsp) throws IOException, javax.servlet.ServletException {
if (Util.isOverridden(View.class, getClass(), "doCreateItem", StaplerRequest2.class, StaplerResponse2.class)) {
try {
return doCreateItem(StaplerRequest.toStaplerRequest2(req), StaplerResponse.toStaplerResponse2(rsp));
} catch (ServletException e) {
throw ServletExceptionWrapper.fromJakartaServletException(e);
}
} else {
throw new AbstractMethodError("The class " + getClass().getName() + " must override at least one of the "
+ View.class.getSimpleName() + ".doCreateItem methods");
}
}

/**
* Makes sure that the given name is good as a job name.
* For use from {@code newJob}.
*/
@Restricted(DoNotUse.class) // called from newJob view
public FormValidation doCheckJobName(@QueryParameter String value) {
// this method can be used to check if a file exists anywhere in the file system,
// so it should be protected.
getOwner().checkPermission(Item.CREATE);

if (Util.fixEmpty(value) == null) {
return FormValidation.ok();
}

try {
Jenkins.checkGoodName(value);
value = value.trim(); // why trim *after* checkGoodName? not sure, but ItemGroupMixIn.createTopLevelItem does the same
ItemGroup<?> parent = getOwner().getItemGroup();
Jenkins.get().getProjectNamingStrategy().checkName(parent.getFullName(), value);
} catch (Failure e) {
return FormValidation.error(e.getMessage());
}

if (getOwner().getItemGroup().getItem(value) != null) {
return FormValidation.error(Messages.Hudson_JobAlreadyExists(value));
}

// looks good
return FormValidation.ok();
}

/**
* An API REST method to get the allowed {$link TopLevelItem}s and its categories.
*
* @return A {@link Categories} entity that is shown as JSON file.
*/
@Restricted(DoNotUse.class)
public Categories doItemCategories(StaplerRequest2 req, StaplerResponse2 rsp, @QueryParameter String iconStyle) throws IOException, ServletException {

Check warning on line 861 in core/src/main/java/hudson/model/View.java

ci.jenkins.io / Java Compiler

compiler:compile

NORMAL: Note: Generating hudson/model/View/doItemCategories.stapler

Check warning on line 861 in core/src/main/java/hudson/model/View.java

ci.jenkins.io / Java Compiler

compiler:testCompile

NORMAL: Note: Generating hudson/model/View/doItemCategories.stapler
getOwner().checkPermission(Item.CREATE);

rsp.addHeader("Cache-Control", "no-cache, no-store, must-revalidate");
Loading
Oops, something went wrong.