Skip to content

Commit

Permalink
Merge branch 'master' into feature/JENKINS-73355-remove-commons-compr…
Browse files Browse the repository at this point in the history
…ess-from-core
  • Loading branch information
jonesbusy authored Nov 27, 2024
2 parents 033be10 + b8e5141 commit 25489ba
Show file tree
Hide file tree
Showing 8 changed files with 89 additions and 95 deletions.
6 changes: 3 additions & 3 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ THE SOFTWARE.

<properties>
<commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
<stapler.version>1922.v3f3302a_7f16f</stapler.version>
<stapler.version>1927.vca_a_9061b_2f28</stapler.version>
<groovy.version>2.4.21</groovy.version>
</properties>

Expand All @@ -62,7 +62,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>6.1.14</version>
<version>6.2.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -290,7 +290,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jvnet.hudson</groupId>
<artifactId>commons-jelly-tags-define</artifactId>
<version>1.1-jenkins-20240903</version>
<version>1.1-jenkins-20241115</version>
</dependency>
<dependency>
<groupId>org.jvnet.localizer</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* newer than {@link RemotingVersionInfo#getMinimumSupportedVersion}.
* (Core and plugin APIs will be identical to those run inside the controller.)
* @param <V> the return type; note that this must either be defined in your plugin or included in the stock JEP-200 whitelist
* @since TODO
* @since 2.485
*/
public interface ControllerToAgentCallable<V, T extends Throwable> extends Callable<V, T> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* {@link FilePath.FileCallable} meant to be serialized then run on an agent.
* Like {@link ControllerToAgentCallable} this will typically be a {@link Record}.
* @param <T> the return type; note that this must either be defined in your plugin or included in the stock JEP-200 whitelist
* @since TODO
* @since 2.485
*/
public interface ControllerToAgentFileCallable<T> extends FilePath.FileCallable<T> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@ THE SOFTWARE.
<j:otherwise>
<j:set var="changelog_url" value="${app.CHANGELOG_URL}"/>
${%NewVersionAvailable(ucData.core.version,ucData.core.url,changelog_url)}
<j:if test="${ucData.canUpgrade()}">
<form method="post" action="${rootURL}/updateCenter/upgrade">
<f:submit value="${%Or Upgrade Automatically}"/>
</form>
</j:if>
<l:isAdmin>
<j:if test="${ucData.canUpgrade()}">
<form method="post" action="${rootURL}/updateCenter/upgrade">
<f:submit value="${%Or Upgrade Automatically}"/>
</form>
</j:if>
</l:isAdmin>
</j:otherwise>
</j:choose>
</div>
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
"@babel/cli": "7.25.9",
"@babel/core": "7.26.0",
"@babel/preset-env": "7.26.0",
"@eslint/js": "9.14.0",
"@eslint/js": "9.15.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.14.0",
"eslint": "9.15.0",
"eslint-config-prettier": "9.1.0",
"eslint-formatter-checkstyle": "8.40.0",
"globals": "15.12.0",
"handlebars-loader": "1.7.3",
"mini-css-extract-plugin": "2.9.2",
"postcss": "8.4.48",
"postcss": "8.4.49",
"postcss-loader": "8.1.1",
"postcss-preset-env": "10.1.0",
"postcss-preset-env": "10.1.1",
"postcss-scss": "4.0.9",
"prettier": "3.3.3",
"sass": "1.80.6",
"sass": "1.81.0",
"sass-loader": "16.0.3",
"style-loader": "4.0.0",
"stylelint": "16.10.0",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ THE SOFTWARE.
</issueManagement>

<properties>
<revision>2.486</revision>
<revision>2.487</revision>
<changelist>-SNAPSHOT</changelist>
<project.build.outputTimestamp>2024-11-12T13:58:29Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-11-19T13:49:45Z</project.build.outputTimestamp>

<!-- configuration for patch tracker plugin -->
<project.patchManagement.system>github</project.patchManagement.system>
Expand Down
4 changes: 2 additions & 2 deletions 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>2351.v862801ec05f9</version>
<version>2353.ve3f890c6eea_f</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -218,7 +218,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>6.955.v81e2a_35c08d3</version>
<version>6.959.v4ed5cc9e2dd4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit 25489ba

Please sign in to comment.