Merge branch 'develop'

intranda · Dec 9, 2024 · 3e97ab2 · 3e97ab2
2 parents fca44d6 + e85746b
commit 3e97ab2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/goobi-viewer-indexer/pom.xml b/goobi-viewer-indexer/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.goobi.viewer</groupId>
 	<artifactId>viewer-indexer</artifactId>
-	<version>24.10</version>
+	<version>24.11-SNAPSHOT</version>
 
 
 	<name>Goobi viewer - Indexer</name>
@@ -48,21 +48,21 @@
 		<angus-mail.version>2.0.3</angus-mail.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<commons-configuration2.version>2.11.0</commons-configuration2.version>
-		<commons-io.version>2.17.0</commons-io.version>
+		<commons-io.version>2.18.0</commons-io.version>
 		<commons-jxpath.version>1.3</commons-jxpath.version>
 		<commons-lang3.version>3.17.0</commons-lang3.version>
 		<commons-text.version>1.12.0</commons-text.version>
 		<httpclient.version>4.5.14</httpclient.version>
 		<httpcore.version>4.4.16</httpcore.version>
 		<icu.version>76.1</icu.version>
 		<imageio-openjpeg.version>0.6.8</imageio-openjpeg.version>
-		<log4j.version>2.24.1</log4j.version>
-		<jackson.version>2.18.1</jackson.version>
+		<log4j.version>2.24.2</log4j.version>
+		<jackson.version>2.18.2</jackson.version>
 		<jaxen.version>2.0.0</jaxen.version>
 		<jai.version>1.4.0</jai.version>
 		<jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>
 		<jdom2.version>2.0.6.1</jdom2.version>
-		<jsoup.version>1.18.1</jsoup.version>
+		<jsoup.version>1.18.3</jsoup.version>
 		<json.version>20240303</json.version>
 		<junit.version>5.11.3</junit.version>
 		<metadata-extractor.version>2.19.0</metadata-extractor.version>
@@ -480,7 +480,7 @@
 					<dependency>
 						<groupId>com.puppycrawl.tools</groupId>
 						<artifactId>checkstyle</artifactId>
-						<version>10.20.1</version>
+						<version>10.20.2</version>
 					</dependency>
 				</dependencies>
 				<executions>

diff --git a/goobi-viewer-indexer/src/main/java/io/goobi/viewer/indexer/MetsIndexer.java b/goobi-viewer-indexer/src/main/java/io/goobi/viewer/indexer/MetsIndexer.java
@@ -1102,7 +1102,7 @@ String selectImageFileGroup(boolean downloadExternalImages) {
                     }
                     break;
                 case OBJECT_FILEGROUP:
-                    if (!PRESENTATION_FILEGROUP.equals(ret) || !DEFAULT_FILEGROUP.equals(ret)) {
+                    if (!PRESENTATION_FILEGROUP.equals(ret) && !DEFAULT_FILEGROUP.equals(ret)) {
                         ret = use;
                     }
                     break;