fix compile problems in 2024.06.x

Author: yagee-de

pom.xml

@@ -35,8 +35,7 @@
     <maven.compiler.release>${java.target.version}</maven.compiler.release>
     <media.projectBase>${project.build.directory}/media</media.projectBase>
     <mir.version>2024.06.1-SNAPSHOT</mir.version>
-    <node.version>v16.19.1</node.version>
-    <npm.version>6.14.18</npm.version>
+    <npm.version>10.9.2</npm.version>
     <rcclient.projectBase>${project.build.directory}/rcclient</rcclient.projectBase>
     <template.assetsdir>${template.targetdir}/dbt/assets</template.assetsdir>
     <template.cssdir>${template.targetdir}/dbt/css</template.cssdir>
@@ -239,7 +238,7 @@
             <goals>
               <goal>npm</goal>
             </goals>
-            <phase>process-resources</phase>
+            <phase>none</phase>
             <configuration>
               <workingDirectory>${rcclient.projectBase}</workingDirectory>
               <arguments>install</arguments>
@@ -251,7 +250,7 @@
             <goals>
               <goal>grunt</goal>
             </goals>
-            <phase>process-resources</phase>
+            <phase>none</phase>
             <configuration>
               <workingDirectory>${rcclient.projectBase}</workingDirectory>
               <arguments>--verbose</arguments>

src/main/grunt/package.json

@@ -14,8 +14,8 @@
   },
   "devDependencies": {
     "@fortawesome/fontawesome-free": "5.13.1",
-    "grunt": ">=1.3.0",
-    "grunt-cli": "^1.2.0",
+    "grunt": ">=1.6.1",
+    "grunt-cli": "^1.5.0",
     "grunt-contrib-concat": "^1.0.0",
     "grunt-replace": "^1.0.0",
     "grunt-contrib-copy": "^1.0.0",
@@ -27,8 +27,9 @@
     "angular-modal-service": "~0.15.2",
     "bootstrap": "4.6.2",
     "bootstrap-fileinput": "~5.1.1",
+    "imagemin-gifsicle": "~7.0.0",
     "node-waves": "~0.7.6",
-    "summernote": "~0.8.11",
+    "summernote": "~0.9.1",
     "jquery-sortable": "~0.9.12",
     "video.js": "7.21.5",
     "videojs-share": "^3.2.1"

src/main/java/de/urmel_dl/dbt/commandline/RepairCommands.java

@@ -144,7 +144,7 @@ private static Optional<String> getDefaultMainFile(MCRDerivate derivate) {
             Files.walkFileTree(path, visitor);
 
             //sort files by name
-            ArrayList<java.nio.file.Path> paths = visitor.getPaths();
+            List<java.nio.file.Path> paths = visitor.getPaths();
             paths.sort(Comparator.comparing(java.nio.file.Path::getNameCount)
                 .thenComparing(java.nio.file.Path::getFileName));
             //extract first file, before filtering

src/main/media/package.json

@@ -27,8 +27,8 @@
     "css-loader": "^6.7.3",
     "extract-loader": "^5.0.1",
     "mini-css-extract-plugin": "^2.7.2",
-    "node-sass": "^9.0.0",
-    "sass-loader": "^13.2.0",
+    "sass": "^1.85.1",
+    "sass-loader": "^16.0.5",
     "svgo": "^1.3.2",
     "svgo-loader": "^2.2.2",
     "terser-webpack-plugin": "^5.3.6",

src/main/resources/xsl/layout/dbt-layout.xsl

@@ -165,7 +165,7 @@
   <xsl:template name="layout.head">
     <nav class="navbar navbar-expand-md navbar-light navbar-dbt fixed-top" role="navigation">
       <div class="container">
-        <a class="navbar-brand" href="{concat($WebApplicationBaseURL,substring($loaded_navigation_xml/@hrefStartingPage,2),$HttpSession)}">
+        <a class="navbar-brand" href="{concat($WebApplicationBaseURL,substring($loaded_navigation_xml/@hrefStartingPage,2))}">
           <span class="img-placeholder"></span>
         </a>
         <button type="button" class="navbar-toggler collapsed plus-sign" data-toggle="collapse" data-target="#navbar,#container-overlay"
@@ -410,7 +410,7 @@
         </li>
         <li class="dropdown-divider" />
         <li class="dropdown-item">
-          <a href="{$ServletsBaseURL}MCRBasketServlet{$HttpSession}?type={$basket/@type}&amp;action=show">
+          <a href="{$ServletsBaseURL}MCRBasketServlet?type={$basket/@type}&amp;action=show">
             <xsl:value-of select="i18n:translate('basket.open')" />
           </a>
         </li>
@@ -426,8 +426,6 @@
           <xsl:with-param name="navigation" select="$loaded_navigation_xml" />
         </xsl:call-template>
 
-        <!-- include Internet Explorer warning -->
-        <xsl:call-template name="msie-note" />
 
 <!--           <xsl:call-template name="action.buttons" /> -->
         <xsl:call-template name="print.writeProtectionMessage" />

src/main/resources/xsl/layout/dbt-navigation.xsl

@@ -72,9 +72,7 @@
           <xsl:value-of select="@href" />
         </xsl:when>
         <xsl:otherwise>
-          <xsl:call-template name="UrlAddSession">
-            <xsl:with-param name="url" select="concat($WebApplicationBaseURL,substring-after(@href,'/'))" />
-          </xsl:call-template>
+          <xsl:value-of select="concat($WebApplicationBaseURL,substring-after(@href,'/'))" />
         </xsl:otherwise>
       </xsl:choose>
     </xsl:param>