Merge pull request #235 from clarin-eric/1.6.14-patch

1.6.14 patch
clarin-eric · Nov 25, 2024 · 7f540aa · 7f540aa
2 parents 74e6b31 + 9da6793
commit 7f540aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -276,9 +276,9 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.33</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.4.0</version>
             <type>jar</type>
         </dependency>
         <dependency>
@@ -428,7 +428,7 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.6.1</version>
+            <version>2.7.4</version>
             <type>jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html b/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BasePage.html
@@ -38,8 +38,10 @@
             <div class="clarin-top visible-xs">
                 <a class="logo center-block" href="http://www.clarin.eu"></a>
             </div>
+            <!--
             <span class="qualifier snapshot">TESTING</span>
             <span class="qualifier beta">BETA</span>
+            -->
             <!--<span wicket:id="authstate">[auth]</span>-->
             <div wicket:id="menu" class="navbar-static-top"  role="banner">[Navigation]</div>            
         </header>