Skip to content

Commit

Permalink
Merge branch 'master' into yui_button_inspired_style
Browse files Browse the repository at this point in the history
  • Loading branch information
scherler authored Dec 17, 2024
2 parents 186d079 + 34aba67 commit d823c78
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 18 deletions.
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ THE SOFTWARE.
<!-- https://docs.spring.io/spring-security/reference/6.3/getting-spring-security.html#getting-maven-no-boot -->
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-bom</artifactId>
<version>6.4.1</version>
<version>6.4.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
10 changes: 10 additions & 0 deletions core/src/main/java/hudson/tools/ZipExtractionInstaller.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.nio.file.FileSystemNotFoundException;
import java.nio.file.Path;
import jenkins.MasterToSlaveFileCallable;
import jenkins.model.Jenkins;
import org.jenkinsci.Symbol;
Expand Down Expand Up @@ -117,6 +119,14 @@ public FormValidation doCheckUrl(@QueryParameter String value) throws Interrupte
} catch (URISyntaxException e) {
return FormValidation.error(e, Messages.ZipExtractionInstaller_malformed_url());
}
if (uri.getScheme() != null && !uri.getScheme().startsWith("http")) {
try {
Path.of(uri);
return FormValidation.ok();
} catch (FileSystemNotFoundException | IllegalArgumentException e) {
return FormValidation.error(e, Messages.ZipExtractionInstaller_malformed_url());
}
}
HttpClient httpClient = ProxyConfiguration.newHttpClient();
HttpRequest httpRequest;
try {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"mini-css-extract-plugin": "2.9.2",
"postcss": "8.4.49",
"postcss-loader": "8.1.1",
"postcss-preset-env": "10.1.1",
"postcss-preset-env": "10.1.2",
"postcss-scss": "4.0.9",
"prettier": "3.4.2",
"sass": "1.83.0",
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>cloudbees-folder</artifactId>
<version>6.973.vc9b_85a_61e4fc</version>
<version>6.975.v4161e479479f</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
30 changes: 15 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3040,16 +3040,16 @@ __metadata:
languageName: node
linkType: hard

"css-has-pseudo@npm:^7.0.1":
version: 7.0.1
resolution: "css-has-pseudo@npm:7.0.1"
"css-has-pseudo@npm:^7.0.2":
version: 7.0.2
resolution: "css-has-pseudo@npm:7.0.2"
dependencies:
"@csstools/selector-specificity": "npm:^5.0.0"
postcss-selector-parser: "npm:^7.0.0"
postcss-value-parser: "npm:^4.2.0"
peerDependencies:
postcss: ^8.4
checksum: 10c0/13789b08b70169204be786d652190356ace9313099d3656bd2fc38afbdd28f3d9620f0e0b07425480961b7a1ec789794961d0472f205b959d3f64c9a78ce511c
checksum: 10c0/456e9ce1eec8a535683c329956acfe53ce5a208345d7f2fcbe662626be8b3c98681e9041d7f4980316714397b0c1c3defde25653d629c396df17803d599c4edf
languageName: node
linkType: hard

Expand Down Expand Up @@ -3165,10 +3165,10 @@ __metadata:
languageName: node
linkType: hard

"cssdb@npm:^8.2.1":
version: 8.2.1
resolution: "cssdb@npm:8.2.1"
checksum: 10c0/d27d7db0a39e1105181aac119a98d6c92cd5ceba2e8bd349cdf2ba4a8d9ead149b685a1dba9542ca24f094cc70eca4a3e02973fe1f74c11a373b508606e5e1c0
"cssdb@npm:^8.2.3":
version: 8.2.3
resolution: "cssdb@npm:8.2.3"
checksum: 10c0/17c3ca6432ed02431db6b44bed74649ccef7d7b7b900ccbc7297525f030722c441dd67c71f28aef3cfa0814ba7b254a24adfb0dcd5728937da179ff437cdcd0c
languageName: node
linkType: hard

Expand Down Expand Up @@ -4389,7 +4389,7 @@ __metadata:
mini-css-extract-plugin: "npm:2.9.2"
postcss: "npm:8.4.49"
postcss-loader: "npm:8.1.1"
postcss-preset-env: "npm:10.1.1"
postcss-preset-env: "npm:10.1.2"
postcss-scss: "npm:4.0.9"
prettier: "npm:3.4.2"
sass: "npm:1.83.0"
Expand Down Expand Up @@ -5893,9 +5893,9 @@ __metadata:
languageName: node
linkType: hard

"postcss-preset-env@npm:10.1.1":
version: 10.1.1
resolution: "postcss-preset-env@npm:10.1.1"
"postcss-preset-env@npm:10.1.2":
version: 10.1.2
resolution: "postcss-preset-env@npm:10.1.2"
dependencies:
"@csstools/postcss-cascade-layers": "npm:^5.0.1"
"@csstools/postcss-color-function": "npm:^4.0.6"
Expand Down Expand Up @@ -5932,9 +5932,9 @@ __metadata:
autoprefixer: "npm:^10.4.19"
browserslist: "npm:^4.23.1"
css-blank-pseudo: "npm:^7.0.1"
css-has-pseudo: "npm:^7.0.1"
css-has-pseudo: "npm:^7.0.2"
css-prefers-color-scheme: "npm:^10.0.0"
cssdb: "npm:^8.2.1"
cssdb: "npm:^8.2.3"
postcss-attribute-case-insensitive: "npm:^7.0.1"
postcss-clamp: "npm:^4.1.0"
postcss-color-functional-notation: "npm:^7.0.6"
Expand Down Expand Up @@ -5962,7 +5962,7 @@ __metadata:
postcss-selector-not: "npm:^8.0.1"
peerDependencies:
postcss: ^8.4
checksum: 10c0/99931117735a66827c7318be023ddb614990457617ccbe7fd2fdc1f10345554652df180d4842768d68d57e14fc0be4d86d0b413c65e77e02db5511e57ed07c4f
checksum: 10c0/bd40330867a525679d434ff9602efbf229da9e745a3759c2d0b3cff166dd0f17bf99b44673ebb316df1906c2bf2edef97aeef1840aa6be170b43a34404df396d
languageName: node
linkType: hard

Expand Down

0 comments on commit d823c78

Please sign in to comment.