Bump jackson from 2.13.3 to 2.13.4; Bump handlebars webjar from 4.0.2…

… to 4.7.7
keeps · Oct 7, 2022 · 5ce464a · 5ce464a
1 parent dae0961
commit 5ce464a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         <version.roda>3.7.0</version.roda>
         <version.jersey>2.35</version.jersey>
         <version.swagger>2.2.0</version.swagger>
-        <version.jackson>2.13.3</version.jackson>
+        <version.jackson>2.13.4</version.jackson>
         <version.cas-client>3.6.4</version.cas-client>
         <version.solr>8.11.1</version.solr>
         <version.springboot>2.6.8</version.springboot>
@@ -251,8 +251,8 @@
                                 -Djava.net.preferIPv4Stack=true
                                 -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl -Dgwt.codeServerPort=9876
                                 -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
-                                -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006
-                                -Dserver.port=8082
+                                -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+                                -Dserver.port=8080
                             </jvmArguments>
                         </configuration>
                     </plugin>
@@ -597,9 +597,9 @@
 
         <!-- Handlerbars -->
         <dependency>
-            <groupId>org.webjars</groupId>
+            <groupId>org.webjars.npm</groupId>
             <artifactId>handlebars</artifactId>
-            <version>4.0.2</version>
+            <version>4.7.7</version>
         </dependency>
         <!-- / Handlerbars -->
 

diff --git a/src/main/java/com/databasepreservation/common/Common.gwt.xml b/src/main/java/com/databasepreservation/common/Common.gwt.xml
@@ -38,6 +38,5 @@
     <!-- https://github.com/resty-gwt/resty-gwt/issues/296 -->
     <!-- in order to use auto-detection on strings you need to set in your XZY-gwt.xml -->
     <set-property name="restygwt.autodetect.plainText" value="true" />
-    <collapse-all-properties />
 </module>
 
diff --git a/src/main/java/com/databasepreservation/server/Server.gwt.xml b/src/main/java/com/databasepreservation/server/Server.gwt.xml
@@ -13,5 +13,4 @@
     <set-property name="compiler.stackMode" value="emulated" />
     <set-configuration-property name="compiler.emulatedStack.recordFileNames" value="true" />
     <set-configuration-property name="compiler.emulatedStack.recordLineNumbers" value="true" />
-    <collapse-all-properties />
 </module>
diff --git a/src/main/resources/config/dbvtk-viewer.properties b/src/main/resources/config/dbvtk-viewer.properties
@@ -48,7 +48,7 @@ solr.stemming.language=en
 ##############################################
 # DBPTK Enterprise base address
 ##############################################
-ui.filter.cas.serverName=http://localhost:8082
+ui.filter.cas.serverName=${env:DBPTKE_EXTERNAL_URL}
 ui.filter.cas.exceptionOnValidationFailure=false
 ui.filter.cas.redirectAfterValidation=false
 ##############################################

diff --git a/src/main/resources/solr-config/solrconfig.xml b/src/main/resources/solr-config/solrconfig.xml
@@ -417,7 +417,7 @@
                       to occupy. Note that when this option is specified, the size
                       and initialSize parameters are ignored.
       -->
-    <filterCache class="solr.FastLRUCache"
+    <filterCache class="solr.CaffeineCache"
                  size="512"
                  initialSize="512"
                  autowarmCount="0"/>

diff --git a/src/main/resources/static/desktop.html b/src/main/resources/static/desktop.html
@@ -30,7 +30,7 @@
   <link href='flexgrid/flexgrid.css' rel='stylesheet' type='text/css'>
 
   <!-- Handlebars -->
-  <script src="webjars/handlebars/4.0.2/handlebars.js"></script>
+  <script src="webjars/handlebars/4.7.7/dist/handlebars.js"></script>
 
   <script type="text/javascript" language="javascript"
           src="com.databasepreservation.desktop.Desktop/com.databasepreservation.desktop.Desktop.nocache.js"></script>

diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -50,7 +50,7 @@
     <link rel="stylesheet" href="webjars/font-awesome/5.10.1/css/all.css">
 
     <!-- Handlebars -->
-    <script src="webjars/handlebars/4.0.2/handlebars.js"></script>
+    <script src="webjars/handlebars/4.7.7/dist/handlebars.js"></script>
 
     <!-- Mini Upload Form dependencies -->
     <script src="webjars/jquery-knob/1.2.13/dist/jquery.knob.min.js"></script>