diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 15667a2a9342c..45e47f01c0572 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -143,6 +143,12 @@ updates:
- dependency-name: org.eclipse.microprofile.openapi:microprofile-openapi-tck
- dependency-name: org.eclipse.microprofile.opentracing:microprofile-opentracing-tck*
- dependency-name: org.eclipse.microprofile.rest.client:microprofile-rest-client-tck
+ # Dev UI web dependencies
+ - dependency-name: org.webjars:bootstrap
+ - dependency-name: org.webjars:font-awesome
+ - dependency-name: org.webjars:jquery
+ - dependency-name: org.webjars:codemirror
+ - dependency-name: org.webjars.npm:mermaid
# Others
- dependency-name: com.puppycrawl.tools:checkstyle
- dependency-name: com.google.cloud.functions:*
@@ -160,7 +166,6 @@ updates:
- dependency-name: org.jboss.modules:jboss-modules
- dependency-name: com.unboundid:unboundid-ldapsdk
- dependency-name: org.commonmark:commonmark
- - dependency-name: org.webjars:*
- dependency-name: org.asciidoctor:asciidoctorj
- dependency-name: com.github.javaparser:javaparser-core
- dependency-name: org.jboss.jdeparser:jdeparser
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index caa93b5158aa9..d181dadbe5b34 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -108,11 +108,12 @@
3.1.0
3.1.2
-
+
4.6.0
5.15.2
- 3.5.1
+ 3.6.0
5.62.2
+
8.9.1
diff --git a/extensions/webjars-locator/deployment/pom.xml b/extensions/webjars-locator/deployment/pom.xml
index 912b626aecd32..a1caceedd3019 100644
--- a/extensions/webjars-locator/deployment/pom.xml
+++ b/extensions/webjars-locator/deployment/pom.xml
@@ -12,6 +12,11 @@
quarkus-webjars-locator-deployment
Quarkus - WebJar Locator - Deployment
+
+ 2.24.0
+ 1.13.0
+
+
org.webjars
@@ -41,19 +46,19 @@
rest-assured
test
-
+
- org.webjars
- jquery
- ${webjar.jquery.version}
- test
+ org.webjars
+ jquery-ui
+ ${webjar.jquery-ui.version}
+ test
- org.webjars
- momentjs
- 2.24.0
- test
+ org.webjars
+ momentjs
+ ${webjar.momentjs.version}
+ test
org.webjars.bowergithub.dc-js
@@ -62,9 +67,9 @@
test
- io.quarkus
- quarkus-resteasy-deployment
- test
+ io.quarkus
+ quarkus-resteasy-deployment
+ test
@@ -82,6 +87,15 @@
+
+ maven-surefire-plugin
+
+
+ ${webjar.jquery-ui.version}
+ ${webjar.momentjs.version}
+
+
+
diff --git a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java
index 4a1b487443e96..7949be6326818 100644
--- a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java
+++ b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorDevModeTest.java
@@ -10,7 +10,7 @@
import io.quarkus.test.QuarkusDevModeTest;
import io.restassured.RestAssured;
-public class WebJarLocatorDevModeTest {
+public class WebJarLocatorDevModeTest extends WebJarLocatorTestSupport {
private static final String META_INF_RESOURCES = "META-INF/resources/";
@RegisterExtension
@@ -42,15 +42,15 @@ public void testDevMode() {
.body(is("Test"));
// Test Existing Web Jars
- RestAssured.get("/webjars/jquery/jquery.min.js").then()
+ RestAssured.get("/webjars/jquery-ui/jquery-ui.min.js").then()
.statusCode(200);
RestAssured.get("/webjars/momentjs/min/moment.min.js").then()
.statusCode(200);
// Test using version in url of existing Web Jar
- RestAssured.get("/webjars/jquery/3.5.1/jquery.min.js").then()
+ RestAssured.get("/webjars/jquery-ui/" + JQUERY_UI_VERSION + "/jquery-ui.min.js").then()
.statusCode(200);
- RestAssured.get("/webjars/momentjs/2.24.0/min/moment.min.js").then()
+ RestAssured.get("/webjars/momentjs/" + MOMENTJS_VERSION + "/min/moment.min.js").then()
.statusCode(200);
// Test non-existing Web Jar
@@ -95,9 +95,9 @@ public void testDevMode() {
.statusCode(200);
// Test using version in url of existing Web Jar
- RestAssured.get("/webjars/jquery/3.5.1/jquery.min.js").then()
+ RestAssured.get("/webjars/jquery-ui/" + JQUERY_UI_VERSION + "/jquery-ui.min.js").then()
.statusCode(200);
- RestAssured.get("/webjars/momentjs/2.24.0/min/moment.min.js").then()
+ RestAssured.get("/webjars/momentjs/" + MOMENTJS_VERSION + "/min/moment.min.js").then()
.statusCode(200);
// Test non-existing Web Jar
diff --git a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java
index 35acba03ae861..7f1814d3e9d12 100644
--- a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java
+++ b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTest.java
@@ -12,7 +12,7 @@
import io.quarkus.test.QuarkusUnitTest;
import io.restassured.RestAssured;
-public class WebJarLocatorTest {
+public class WebJarLocatorTest extends WebJarLocatorTestSupport {
private static final String META_INF_RESOURCES = "META-INF/resources/";
@RegisterExtension
@@ -20,8 +20,8 @@ public class WebJarLocatorTest {
.withApplicationRoot((jar) -> jar
.addAsResource(new StringAsset("Hello!"), META_INF_RESOURCES + "/index.html")
.addAsResource(new StringAsset("Test"), META_INF_RESOURCES + "/some/path/test.txt"))
- .setForcedDependencies(Arrays.asList(new AppArtifact("org.webjars", "jquery", "3.5.1"),
- new AppArtifact("org.webjars", "momentjs", "2.24.0")));
+ .setForcedDependencies(Arrays.asList(new AppArtifact("org.webjars", "jquery-ui", JQUERY_UI_VERSION),
+ new AppArtifact("org.webjars", "momentjs", MOMENTJS_VERSION)));
@Test
public void test() {
@@ -39,15 +39,15 @@ public void test() {
.body(is("Test"));
// Test Existing Web Jars
- RestAssured.get("/webjars/jquery/jquery.min.js").then()
+ RestAssured.get("/webjars/jquery-ui/jquery-ui.min.js").then()
.statusCode(200);
RestAssured.get("/webjars/momentjs/min/moment.min.js").then()
.statusCode(200);
// Test using version in url of existing Web Jar
- RestAssured.get("/webjars/jquery/3.5.1/jquery.min.js").then()
+ RestAssured.get("/webjars/jquery-ui/" + JQUERY_UI_VERSION + "/jquery-ui.min.js").then()
.statusCode(200);
- RestAssured.get("/webjars/momentjs/2.24.0/min/moment.min.js").then()
+ RestAssured.get("/webjars/momentjs/" + MOMENTJS_VERSION + "/min/moment.min.js").then()
.statusCode(200);
// Test non-existing Web Jar
diff --git a/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTestSupport.java b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTestSupport.java
new file mode 100644
index 0000000000000..83e84572f0b8e
--- /dev/null
+++ b/extensions/webjars-locator/deployment/src/test/java/io/quarkus/webjar/locator/test/WebJarLocatorTestSupport.java
@@ -0,0 +1,7 @@
+package io.quarkus.webjar.locator.test;
+
+class WebJarLocatorTestSupport {
+
+ static final String JQUERY_UI_VERSION = System.getProperty("webjar.jquery-ui.version");
+ static final String MOMENTJS_VERSION = System.getProperty("webjar.momentjs.version");
+}
diff --git a/integration-tests/webjars-locator/pom.xml b/integration-tests/webjars-locator/pom.xml
index b2f66b8c6d434..3a5680dd21ede 100644
--- a/integration-tests/webjars-locator/pom.xml
+++ b/integration-tests/webjars-locator/pom.xml
@@ -13,7 +13,11 @@
quarkus-integration-test-webjars-locator
Quarkus - Integration Tests - WebJar Locator
-
+
+
+ 2.24.0
+ 1.13.0
+
@@ -26,13 +30,13 @@
org.webjars
- jquery
- ${webjar.jquery.version}
+ jquery-ui
+ ${webjar.jquery-ui.version}
org.webjars
momentjs
- 2.24.0
+ ${webjar.momentjs.version}
@@ -88,6 +92,15 @@
+
+ maven-surefire-plugin
+
+
+ ${webjar.jquery-ui.version}
+ ${webjar.momentjs.version}
+
+
+
diff --git a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/WebJarResourceTest.java b/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/WebJarResourceTest.java
index 45b6546fb48d8..61425ba78e6a1 100644
--- a/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/WebJarResourceTest.java
+++ b/integration-tests/webjars-locator/src/test/java/io/quarkus/it/webjar/locator/WebJarResourceTest.java
@@ -8,6 +8,9 @@
@QuarkusTest
public class WebJarResourceTest {
+ private static final String JQUERY_UI_VERSION = System.getProperty("webjar.jquery-ui.version");
+ private static final String MOMENTJS_VERSION = System.getProperty("webjar.momentjs.version");
+
@Test
void testWebJar() {
// Test Existing Web Jars
@@ -17,9 +20,9 @@ void testWebJar() {
.statusCode(200);
// Test using version in url of existing Web Jar
- RestAssured.get("/webjars/jquery/3.5.1/jquery.min.js").then()
+ RestAssured.get("/webjars/jquery-ui/" + JQUERY_UI_VERSION + "/jquery-ui.min.js").then()
.statusCode(200);
- RestAssured.get("/webjars/momentjs/2.24.0/min/moment.min.js").then()
+ RestAssured.get("/webjars/momentjs/" + MOMENTJS_VERSION + "/min/moment.min.js").then()
.statusCode(200);
// Test non-existing Web Jar