Skip to content

Commit

Permalink
Merge branch 'master' into command-palette
Browse files Browse the repository at this point in the history
  • Loading branch information
janfaracik authored Sep 28, 2024
2 parents 57905c2 + 435bb79 commit cdff812
Show file tree
Hide file tree
Showing 24 changed files with 209 additions and 167 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
{
"customType": "regex",
"fileMatch": [
"war/pom.xml"
"pom.xml"
],
"matchStrings": [
"<node.version>(?<currentValue>.*?)</node.version>"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-since-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
id: run_script
shell: bash
- name: Create Pull Request
uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Fill in since annotations
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,6 @@ node_modules/

# Generated JavaScript Bundles
jsbundles

# In case someone accidentally runs npm install instead of yarn install
package-lock.json
9 changes: 6 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/ja

### Running the Yarn frontend build

> [!TIP]
> If you already have Node.js installed, you do not need to change your path. Start using `yarn` by enabling [Corepack](https://yarnpkg.com/corepack) with `corepack enable`, if it isn't already; this will add the `yarn` binary to your PATH.
To run the Yarn frontend build, after [building the WAR file](#building-the-war-file), add the downloaded versions of Node and Yarn to your path:

```sh
Expand All @@ -74,7 +77,7 @@ On one terminal, start a development server that will not process frontend asset
MAVEN_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED' mvn -pl war jetty:run -Dskip.yarn
```

Open another terminal and start a [webpack](https://webpack.js.org/) dev server, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build):
Open another terminal and start a [webpack](https://webpack.js.org/) dev server, after [optionally adding Node and Yarn to your path](#running-the-yarn-frontend-build):

```sh
yarn start
Expand Down Expand Up @@ -108,13 +111,13 @@ To automatically fix backend issues, run:
mvn spotless:apply
```

To view frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:
To view frontend issues, after [optionally adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:

```sh
yarn lint
```

To fix frontend issues, after [adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:
To fix frontend issues, after [optionally adding Node and Yarn to your path](#running-the-yarn-frontend-build), run:

```sh
yarn lint:fix
Expand Down
2 changes: 1 addition & 1 deletion ath.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o xtrace
cd "$(dirname "$0")"

# https://github.com/jenkinsci/acceptance-test-harness/releases
export ATH_VERSION=5992.v39030e88deb_3
export ATH_VERSION=5997.v2a_1a_696620a_0

if [[ $# -eq 0 ]]; then
export JDK=17
Expand Down
4 changes: 2 additions & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ THE SOFTWARE.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.16.1</version>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
Expand Down Expand Up @@ -169,7 +169,7 @@ THE SOFTWARE.
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.14.0</version>
<version>5.15.0</version>
</dependency>
<dependency>
<groupId>net.java.sezpoz</groupId>
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/hudson/lifecycle/WindowsInstallerLink.java
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public void run() {
new File(installationDir, "jenkins.exe"), "start", task, installationDir);
task.getLogger().println(r == 0 ? "Successfully started" : "start service failed. Exit code=" + r);
} catch (IOException | InterruptedException e) {
e.printStackTrace();
LOGGER.log(Level.WARNING, null, e);
}
}

Expand All @@ -241,7 +241,7 @@ private DefaultLogger createLogger() {
Jenkins.get().cleanUp();
System.exit(0);
} catch (InterruptedException e) {
e.printStackTrace();
LOGGER.log(Level.SEVERE, null, e);
}
}
}.start();
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/model/AbstractItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ protected void renameTo(final String newName) throws IOException {
Util.deleteRecursive(oldRoot);
} catch (IOException e) {
// but ignore the error, since we expect that
e.printStackTrace();
LOGGER.log(Level.WARNING, "Ignoring IOException while deleting", e);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public boolean isEnabled() {
* Optional description for the configurable object
* Displays as plain text
*
* @since TODO
* @since 2.477
*/
@Nullable
public String getDescription() {
Expand Down
15 changes: 12 additions & 3 deletions core/src/main/java/hudson/model/ViewJob.java
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,23 @@ private boolean terminating() {
@Override
public void run() {
while (!terminating()) {
String jobName = null;
try {
getNext()._reload();
var next = getNext();
jobName = next.getFullName();
next._reload();
jobName = null;
} catch (InterruptedException e) {
// treat this as a death signal
return;
} catch (Throwable t) {
} catch (Exception e) {
// otherwise ignore any error
t.printStackTrace();
if (jobName != null) {
var finalJobName = jobName;
LOGGER.log(Level.WARNING, e, () -> "Failed to reload job " + finalJobName);
} else {
LOGGER.log(Level.WARNING, e, () -> "Failed to obtain next job in the reload queue");
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/jenkins/model/HistoricalBuild.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
/**
* A {@link Run}-like object as it might be displayed by {@link BuildHistoryWidget}.
*
* @since TODO
* @since 2.477
*/
@Restricted(Beta.class)
public interface HistoricalBuild extends ModelObject {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/jenkins/model/Jenkins.java
Original file line number Diff line number Diff line change
Expand Up @@ -5629,7 +5629,7 @@ private static void computeVersion(ServletContext context) {
if (is != null)
props.load(is);
} catch (IOException e) {
e.printStackTrace(); // if the version properties is missing, that's OK.
LOGGER.log(Level.WARNING, e, () -> "Failed to load jenkins-version.properties");
}
String ver = props.getProperty("version");
if (ver == null) ver = UNCOMPUTED_VERSION;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,10 @@ public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request
return from(self, request, response, "sidepanel");
}

public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest request, StaplerResponse response) throws JellyException, IOException {
return from(self, StaplerRequest.toStaplerRequest2(request), StaplerResponse.toStaplerResponse2(response), "sidepanel");
}

public ContextMenu from(ModelObjectWithContextMenu self, StaplerRequest2 request, StaplerResponse2 response, String view) throws JellyException, IOException {
WebApp webApp = WebApp.getCurrent();
final Script s = webApp.getMetaClass(self).getTearOff(JellyClassTearOff.class).findScript(view);
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/model/Messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ User.IllegalUsername="{0}" is prohibited as a username for security reasons.
User.IllegalFullname="{0}" is prohibited as a full name for security reasons.

TimeZoneProperty.DisplayName=Time zone
TimeZoneProperty.Description=Select a time zone to use rather than the system default
TimeZoneProperty.Description=Select a time zone to use rather than the system default.
TimeZoneProperty.DisplayDefaultTimeZone=Default
TimeZoneProperty.current_time_in_=Current time in {0}: {1}
TimeZoneProperty.current_time_on_server_in_in_proposed_di=Current time on server in {0}: {1}; in proposed display zone: {2}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@

title=Account
Full\ name=Full name
Full\ name.Description=We recommend using your real name so people can recognize you instead of your ID
Full\ name.Description=We recommend using your real name so people can recognize you instead of your ID.
Description=Description
Description.Description=Enter a short description about yourself so that visitors know who you are
Description.Description=Enter a short description about yourself so that visitors know who you are.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,24 @@
"@babel/cli": "7.25.6",
"@babel/core": "7.25.2",
"@babel/preset-env": "7.25.4",
"@eslint/js": "9.10.0",
"babel-loader": "9.1.3",
"@eslint/js": "9.11.0",
"babel-loader": "9.2.1",
"clean-webpack-plugin": "4.0.0",
"css-loader": "7.1.2",
"css-minimizer-webpack-plugin": "7.0.0",
"eslint": "9.10.0",
"eslint": "9.11.0",
"eslint-config-prettier": "9.1.0",
"eslint-formatter-checkstyle": "8.40.0",
"globals": "15.9.0",
"handlebars-loader": "1.7.3",
"mini-css-extract-plugin": "2.9.1",
"postcss": "8.4.45",
"postcss": "8.4.47",
"postcss-loader": "8.1.1",
"postcss-preset-env": "10.0.3",
"postcss-scss": "4.0.9",
"prettier": "3.3.3",
"sass": "1.78.0",
"sass-loader": "16.0.1",
"sass": "1.79.3",
"sass-loader": "16.0.2",
"style-loader": "4.0.0",
"stylelint": "16.9.0",
"stylelint-checkstyle-reporter": "1.0.0",
Expand All @@ -65,5 +65,5 @@
"defaults",
"not IE 11"
],
"packageManager": "yarn@4.4.1"
"packageManager": "yarn@4.5.0"
}
Loading

0 comments on commit cdff812

Please sign in to comment.