chore: Remove WebJar dependency (#3818)

Signed-off-by: Pavel Jareš <Pavel.Jares@broadcom.com>
zowe · Oct 9, 2024 · 430ae3b · 430ae3b
1 parent 6c6d4c2
commit 430ae3b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/discoverable-client/build.gradle b/discoverable-client/build.gradle
@@ -92,7 +92,6 @@ dependencies {
     implementation libs.tomcat.embed.core
     implementation libs.jackson.core
     implementation libs.jackson.databind
-    implementation libs.bootstrap
     implementation libs.jquery
 
     implementation libs.gson

diff --git a/discoverable-client/src/main/resources/static/index.html b/discoverable-client/src/main/resources/static/index.html
@@ -7,7 +7,7 @@
     <title>Discoverable Client Hello World!</title>
 
     <!-- Bootstrap core CSS -->
-    <link rel="stylesheet" type="text/css" href="webjars/bootstrap/4.3.1/css/bootstrap.min.css"/>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"/>
 
     <!-- Custom styles for this template -->
     <link href="css/hello.css" rel="stylesheet">
@@ -82,8 +82,8 @@ <h2>WebSockets</h2>
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script type="text/javascript" src="webjars/jquery/3.6.0/jquery.min.js"></script>
-<script type="text/javascript" src="webjars/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
 <script src="js/hello.js"></script>
 </body>
 </html>
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -28,7 +28,6 @@ dependencyResolutionManagement {
             version('awaitility', '4.2.2')
             version('awsJavaSdk', '1.12.770')
             version('bouncyCastle', '1.78.1')
-            version('bootstrap', '4.3.1')
             // forced version in root gradle.build file. Version 3.x requieres Java 11
             version('caffeine', '2.9.3')
             version('commonsCodec', '1.17.1')
@@ -239,7 +238,6 @@ dependencyResolutionManagement {
             library('awaitility', 'org.awaitility', 'awaitility').versionRef('awaitility')
             library('bcprov', 'org.bouncycastle', 'bcprov-jdk18on').versionRef('bouncyCastle')
             library('bcpkix', 'org.bouncycastle', 'bcpkix-jdk18on').versionRef('bouncyCastle')
-            library('bootstrap', 'org.webjars', 'bootstrap').versionRef('bootstrap')
             library('caffeine', 'com.github.ben-manes.caffeine', 'caffeine').versionRef('caffeine')
             library('commons_io', 'commons-io', 'commons-io').versionRef('commonsIo')
             library('eh_cache', 'org.ehcache', 'ehcache').versionRef('ehCache')

diff --git a/mock-services/build.gradle b/mock-services/build.gradle
@@ -94,7 +94,6 @@ dependencies {
     implementation libs.spring.messaging
     implementation libs.spring.webmvc
 
-    implementation libs.bootstrap
     implementation libs.jquery
 
     implementation libs.gson