From 6eeead3458f96ac58fdde2dfc7bd085eef2b46dc Mon Sep 17 00:00:00 2001
From: Jan Vonde <jan.vonde@intranda.com>
Date: Wed, 22 Jan 2025 09:00:15 +0100
Subject: [PATCH 1/6] remove obsolete ignoredUsedUndeclaredDependency

---
 goobi-viewer-core/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/goobi-viewer-core/pom.xml b/goobi-viewer-core/pom.xml
index b22d57d05eb6..9bf0fc366554 100644
--- a/goobi-viewer-core/pom.xml
+++ b/goobi-viewer-core/pom.xml
@@ -893,9 +893,6 @@
 								<ignoredUsedUndeclaredDependency>io.swagger.core.v3:swagger-annotations</ignoredUsedUndeclaredDependency>
 								<ignoredUsedUndeclaredDependency>io.swagger.core.v3:swagger-models</ignoredUsedUndeclaredDependency>
 
-								<!-- Used by iiif-api-model -->
-								<ignoredUsedUndeclaredDependency>jakarta.xml.bind:jakarta.xml.bind-api</ignoredUsedUndeclaredDependency>
-
 								<ignoredUsedUndeclaredDependency>org.glassfish.hk2.external:jakarta.inject</ignoredUsedUndeclaredDependency>
 							</ignoredUsedUndeclaredDependencies>
 

From 70c4a1aba60ede85de56c99a9a6daffe876cdfd6 Mon Sep 17 00:00:00 2001
From: Jan Vonde <jan.vonde@intranda.com>
Date: Wed, 22 Jan 2025 09:04:27 +0100
Subject: [PATCH 2/6] remove another obsolete ignoredUnusedDeclaredDependency

---
 goobi-viewer-core/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/goobi-viewer-core/pom.xml b/goobi-viewer-core/pom.xml
index 9bf0fc366554..d1c4581f5b24 100644
--- a/goobi-viewer-core/pom.xml
+++ b/goobi-viewer-core/pom.xml
@@ -927,9 +927,6 @@
 								<ignoredUnusedDeclaredDependency>jakarta.enterprise:jakarta.enterprise.cdi-api</ignoredUnusedDeclaredDependency>
 								<ignoredUnusedDeclaredDependency>jakarta.enterprise:jakarta.enterprise.cdi-el-api</ignoredUnusedDeclaredDependency>
 
-								<!-- bind-api is required for Jersey -->
-								<ignoredUnusedDeclaredDependency>jakarta.xml.bind:jakarta.xml.bind-api</ignoredUnusedDeclaredDependency>
-
 								<!-- org.citationstyles.* are runtime resources for citeproc -->
 								<ignoredUnusedDeclaredDependency>org.citationstyles:locales</ignoredUnusedDeclaredDependency>
 								<ignoredUnusedDeclaredDependency>org.citationstyles:styles</ignoredUnusedDeclaredDependency>

From 0c2aa46cf07655c6bfe67bb8f97719861e444a46 Mon Sep 17 00:00:00 2001
From: Jan Vonde <jan.vonde@intranda.com>
Date: Wed, 22 Jan 2025 09:06:12 +0100
Subject: [PATCH 3/6] Reapply "try to disable mockito warning in java 21"

This reverts commit b9e86ffc09b148e05b8e0534f329adab8cdee140.
---
 goobi-viewer-core/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/goobi-viewer-core/pom.xml b/goobi-viewer-core/pom.xml
index d1c4581f5b24..3d30caf7644f 100644
--- a/goobi-viewer-core/pom.xml
+++ b/goobi-viewer-core/pom.xml
@@ -882,6 +882,7 @@
 						<id>analyze</id>
 						<goals>
 							<goal>analyze-only</goal>
+							<goal>properties</goal>
 						</goals>
 						<configuration>
 							<failOnWarning>true</failOnWarning>
@@ -1011,7 +1012,8 @@
 					</excludes>
 					<systemPropertyVariables>
 						<java.util.logging.config.file>src/test/resources/log4j2.test.xml</java.util.logging.config.file>
-					</systemPropertyVariables>
+                    </systemPropertyVariables>
+                    <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
 				</configuration>
 			</plugin>
 			<plugin>

From 55e8cf89221751adc0eb3b641296e891a12eb0c2 Mon Sep 17 00:00:00 2001
From: Jan Vonde <jan.vonde@intranda.com>
Date: Wed, 22 Jan 2025 09:19:12 +0100
Subject: [PATCH 4/6] pom.xml: reduce max allowed checkstyle violations

---
 goobi-viewer-core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/goobi-viewer-core/pom.xml b/goobi-viewer-core/pom.xml
index 3d30caf7644f..054eab52eb73 100644
--- a/goobi-viewer-core/pom.xml
+++ b/goobi-viewer-core/pom.xml
@@ -70,7 +70,7 @@
 		<sonar.java.target>21</sonar.java.target>
 
 		<!-- Checkstyle -->
-		<checkstyle.max.violations>50</checkstyle.max.violations>
+		<checkstyle.max.violations>40</checkstyle.max.violations>
 		<skipCheckstyle>true</skipCheckstyle>
 
 		<!-- Manifest information -->

From 0c896197c3666846d950af91feb97246838543e2 Mon Sep 17 00:00:00 2001
From: Andrey Kozhushkov <andrey.kozhushkov@intranda.com>
Date: Wed, 22 Jan 2025 10:10:28 +0100
Subject: [PATCH 5/6] removed commented out code; refs #25697

---
 .../resources/admin/views/adminTasks.xhtml      | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/admin/views/adminTasks.xhtml b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/admin/views/adminTasks.xhtml
index c1d9b34426c6..11fe8f229bad 100644
--- a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/admin/views/adminTasks.xhtml
+++ b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/admin/views/adminTasks.xhtml
@@ -78,6 +78,7 @@
 
 
 							<ui:fragment rendered="#{messageQueueBean.queueContent.size() > 0}">
+							    <!-- Use <button> instead of <a> here to avoid error with OmniFaces -->
 							    <button class="admin__tasks-icon-wrapper"
 							        title="#{msg.admin__tasks__clear_all_button_tooltip}"
 							        data-toggle="tooltip" data-placement="top" data-trigger="hover"
@@ -94,22 +95,6 @@
                                     </div>
                                     <f:ajax execute="@form" render="@form" />
 							    </button>
-<!-- 								<a class="admin__tasks-icon-wrapper" -->
-<!-- 									title="#{msg.admin__tasks__clear_all_button_tooltip}" -->
-<!-- 									data-toggle="tooltip" data-placement="top" data-trigger="hover" -->
-<!-- 									jsf:action="#{messageQueueBean.clearQueue}" jsf:id="clearButton" -->
-<!-- 									data-require-confirmation="true" -->
-<!-- 									data-confirmation-text="#{msg.admin__tasks__clear_all_button_confirmation}" -->
-<!-- 									aria-label="#{msg.admin__tasks__clear_all_button_confirmation}"> -->
-<!-- 									<div class="admin__tasks-clear-all"></div> -->
-<!-- 									<div class="admin__tasks-icon"> -->
-<!-- 										<div -->
-<!-- 											class="admin__tasks-button-trash #{messageQueueBean.paused ? '-hidden' : '-active'}"> -->
-<!-- 											<i class="fa fa-times"></i> -->
-<!-- 										</div> -->
-<!-- 									</div> -->
-<!-- 									<f:ajax execute="@form" render="@form" /> -->
-<!-- 								</a> -->
 							</ui:fragment>
 							
 							 

From b68ae0a7e10910a4a8bd4c31ab1d8f10455fabbe Mon Sep 17 00:00:00 2001
From: JHG <jan.guenther@intranda.com>
Date: Wed, 22 Jan 2025 11:09:32 +0100
Subject: [PATCH 6/6] added css classes to search facet list items

---
 .../components/widgets/searchFacets/searchFacets.xhtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/components/widgets/searchFacets/searchFacets.xhtml b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/components/widgets/searchFacets/searchFacets.xhtml
index 271fc74afa47..90b6892d723b 100644
--- a/goobi-viewer-core/src/main/resources/META-INF/resources/resources/components/widgets/searchFacets/searchFacets.xhtml
+++ b/goobi-viewer-core/src/main/resources/META-INF/resources/resources/components/widgets/searchFacets/searchFacets.xhtml
@@ -141,8 +141,8 @@
 
                                     <!-- ACTIVE FACETS -->
                                     <c:forEach items="#{searchBean.facets.getActiveFacetsForField(field.key)}" var="facet">
-                                        <li class="active">
-                                            <h:commandLink action="#{searchBean.removeFacetAction(facet.link)}" title="#{msg.removeFacet}">
+                                        <li class="widget-search-facets__list-item active">
+                                            <h:commandLink styleClass="widget-search-facets__list-item-link" action="#{searchBean.removeFacetAction(facet.link)}" title="#{msg.removeFacet}">
                                                 <div class="row">
                                                     <div class="col-11">#{facet.translatedLabel}</div>
                                                     <div class="col-1">
@@ -158,10 +158,10 @@
                                     
                                     <!-- AVAILABLE FACETS -->
                                     <ui:repeat value="#{searchBean.facets.getLimitedFacetListForField(field.key)}" var="facet">
-                                        <li>
-                                            <h:outputLink
+                                        <li class="widget-search-facets__list-item">
+                                            <h:outputLink styleClass="widget-search-facets__list-item-link"
                                                 value="#{navigationHelper.getSearchUrl(searchBean.activeSearchType, cc.attrs.cmsPage)}/#{searchBean.activeResultGroupName}/#{searchBean.exactSearchString}/1/#{searchBean.sortString}/#{searchBean.facets.activeFacetStringPrefix}#{facet.urlEscapedLink}/">
-                                                #{facet.translatedLabel} (#{facet.count})
+                                                <span class="widget-search-facets__list-item-label">#{facet.translatedLabel}</span>  <span class="widget-search-facets__list-item-count">(#{facet.count})</span>
                                                 <f:passThroughAttribute name="aria-label" value="#{msg[field.key.concat('_DD')]}: #{facet.translatedLabel}" />
                                             </h:outputLink>
                                         </li>