[webjars] Use the webjars locator

hazendaz · Jul 19, 2024 · b218f68 · b218f68
1 parent ef1dd85
commit b218f68
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 20 deletions.
diff --git a/psi-probe-web/pom.xml b/psi-probe-web/pom.xml
@@ -42,6 +42,7 @@
 
         <!-- Javascript -->
         <scriptaculous.version>1.9.0</scriptaculous.version>
+        <webjars-locator.version>0.47</webjars-locator.version>
     </properties>
 
     <dependencies>
@@ -92,6 +93,11 @@
             <artifactId>logback-classic</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>webjars-locator</artifactId>
+            <version>${webjars-locator.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>scriptaculous</artifactId>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/allappstats.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/allappstats.jsp
@@ -22,7 +22,7 @@
             <spring:message code="probe.jsp.title.allappstats"/>
         </title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
     </head>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/appattributes.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/appattributes.jsp
@@ -27,7 +27,7 @@
         <link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}<spring:theme code='scroller.css'/>"/>
         <script src="<c:url value='/js/prototype.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/areascroller.js'/>"></script>
     </head>
 

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/applications.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/applications.jsp
@@ -25,7 +25,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.applications"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
     </head>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/appsummary.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/appsummary.jsp
@@ -40,7 +40,7 @@
             </c:when>
             <c:otherwise>
                 <script src="<c:url value='/js/prototype.js'/>"></script>
-                <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+                <script src="/webjars/scriptaculous/scriptaculous.js"></script>
                 <script src="<c:url value='/js/func.js'/>"></script>
                 <script src="<c:url value='/js/behaviour.js'/>"></script>
 

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/cluster.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/cluster.jsp
@@ -22,7 +22,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.cluster"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
     </head>
 

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/connectors.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/connectors.jsp
@@ -23,7 +23,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.connectors"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/Tooltip.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
         <script src="<c:url value='/js/func.js'/>"></script>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/datasources.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/datasources.jsp
@@ -19,7 +19,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.datasources"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
     </head>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/datasourcetest.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/datasourcetest.jsp
@@ -24,7 +24,7 @@
         <link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}<spring:theme code='scroller.css'/>"/>
         <script src="<c:url value='/js/prototype.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
         <script src="<c:url value='/js/areascroller.js'/>"></script>
         <script src="<c:url value='/js/datasourcetest.js'/>"></script>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/follow.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/follow.jsp
@@ -24,7 +24,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.follow"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
     </head>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/memory.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/memory.jsp
@@ -21,7 +21,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.memory"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
     </head>
 

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/osinfo.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/osinfo.jsp
@@ -20,7 +20,7 @@
     <head>
         <title><spring:message code="probe.jsp.sysinfo.os.title"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
     </head>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/sessions.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/sessions.jsp
@@ -32,7 +32,7 @@
             </c:otherwise>
         </c:choose>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/Tooltip.js'/>"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/showjsps.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/showjsps.jsp
@@ -21,7 +21,7 @@
     <head>
         <title><spring:message htmlEscape="true" code="probe.jsp.title.jsps" arguments="${param.webapp}"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
     </head>
 
     <c:set var="navTabApps" value="active" scope="request"/>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/threads.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/threads.jsp
@@ -21,7 +21,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.threads"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
     </head>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/threads_sun.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/threads_sun.jsp
@@ -20,7 +20,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.threads"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/Tooltip.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
         <script src="<c:url value='/js/func.js'/>"></script>

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/view_jsp_source.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/view_jsp_source.jsp
@@ -23,7 +23,7 @@
         <link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}<spring:theme code='scroller.css'/>"/>
         <script src="<c:url value='/js/prototype.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/areascroller.js'/>"></script>
     </head>
 

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/view_servlet_source.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/view_servlet_source.jsp
@@ -22,7 +22,7 @@
         <link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}<spring:theme code='scroller.css'/>"/>
         <script src="<c:url value='/js/prototype.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/areascroller.js'/>"></script>
     </head>
 

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/view_xml_conf.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/view_xml_conf.jsp
@@ -25,7 +25,7 @@
         <link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}<spring:theme code='scroller.css'/>"/>
         <script src="<c:url value='/js/prototype.js'/>"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/areascroller.js'/>"></script>
     </head>
 

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/wrapper.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/wrapper.jsp
@@ -20,7 +20,7 @@
     <head>
         <title><spring:message code="probe.jsp.title.wrapper"/></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/behaviour.js'/>"></script>
     </head>
 

diff --git a/psi-probe-web/src/main/webapp/WEB-INF/jsp/zoomreq.jsp b/psi-probe-web/src/main/webapp/WEB-INF/jsp/zoomreq.jsp
@@ -20,7 +20,7 @@
     <head>
         <title><c:out value="${param.cn}" /></title>
         <script src="<c:url value='/js/prototype.js'/>"></script>
-        <script src="/webjars/scriptaculous/1.9.0/scriptaculous.js"></script>
+        <script src="/webjars/scriptaculous/scriptaculous.js"></script>
         <script src="<c:url value='/js/func.js'/>"></script>
     </head>