Skip to content

Commit

Permalink
Merge branch 'master' into improve-view-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
janfaracik committed Sep 23, 2024
2 parents e5253ed + 32039da commit 01beb13
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 21 deletions.
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@6cd32fd93684475c31847837f87bb135d40a2b79 # v7
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Fill in since annotations
Expand Down
2 changes: 1 addition & 1 deletion 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
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 @@ -5631,7 +5631,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
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.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@babel/core": "7.25.2",
"@babel/preset-env": "7.25.4",
"@eslint/js": "9.10.0",
"babel-loader": "9.1.3",
"babel-loader": "9.2.1",
"clean-webpack-plugin": "4.0.0",
"css-loader": "7.1.2",
"css-minimizer-webpack-plugin": "7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>2272.v5db_817b_a_6f0d</version>
<version>2276.va_79e4182e71e</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2635,16 +2635,16 @@ __metadata:
languageName: node
linkType: hard

"babel-loader@npm:9.1.3":
version: 9.1.3
resolution: "babel-loader@npm:9.1.3"
"babel-loader@npm:9.2.1":
version: 9.2.1
resolution: "babel-loader@npm:9.2.1"
dependencies:
find-cache-dir: "npm:^4.0.0"
schema-utils: "npm:^4.0.0"
peerDependencies:
"@babel/core": ^7.12.0
webpack: ">=5"
checksum: 10c0/e3fc3c9e02bd908b37e8e8cd4f3d7280cf6ac45e33fc203aedbb615135a0fecc33bf92573b71a166a827af029d302c0b060354985cd91d510320bd70a2f949eb
checksum: 10c0/efb82faff4c7c27e9c15bb28bf11c73200e61cf365118a9514e8d74dd489d0afc2a0d5aaa62cb4254eefc2ab631579224d95a03fd245410f28ea75e24de54ba4
languageName: node
linkType: hard

Expand Down Expand Up @@ -4391,7 +4391,7 @@ __metadata:
"@babel/core": "npm:7.25.2"
"@babel/preset-env": "npm:7.25.4"
"@eslint/js": "npm:9.10.0"
babel-loader: "npm:9.1.3"
babel-loader: "npm:9.2.1"
clean-webpack-plugin: "npm:4.0.0"
css-loader: "npm:7.1.2"
css-minimizer-webpack-plugin: "npm:7.0.0"
Expand Down

0 comments on commit 01beb13

Please sign in to comment.