Merge branch 'develop'

intranda · Jun 1, 2023 · 4b5bdb9 · 4b5bdb9
2 parents 3334493 + a9581dc
commit 4b5bdb9
Show file tree

Hide file tree

Showing 274 changed files with 8,434 additions and 5,233 deletions.
diff --git a/Goobi/install/config/goobi_mail.xml b/Goobi/install/config/goobi_mail.xml
@@ -9,7 +9,7 @@
         <smtpSenderAddress>do-not-reply@example.com</smtpSenderAddress>
     </configuration>
     <apiUrl>https://example.com/goobi/api/mails/disable</apiUrl>
-
+    <enableStatusChange>false</enableStatusChange>    
 
     <userCreation>
         <subject>Registration successful</subject>

diff --git a/Goobi/install/config/goobi_projects.xml b/Goobi/install/config/goobi_projects.xml
@@ -113,7 +113,7 @@ Sequence for determining the right <project> element:
                 <processtitle isdoctype="monograph">ATS+TSL+'_'+Identifier digital (a)</processtitle>
                 <processtitle isdoctype="periodical">TSL+'_'+Identifier digital (b)+'_'+Label number</processtitle>
 
-                <hide />
+                <hide>images</hide>
             </itemlist>
             <opac use="true">
                 <catalogue>Library of Congress</catalogue>

diff --git a/Goobi/module-ci/pom.xml b/Goobi/module-ci/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>de.intranda.goobi.workflow</groupId>
         <artifactId>goobi-core</artifactId>
-        <version>23.04.3</version>
+        <version>23.05-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
 
     <groupId>de.intranda.goobi.workflow</groupId>
     <artifactId>goobi-core-ci</artifactId>
-    <version>23.04.3</version>
+    <version>23.05-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 

diff --git a/Goobi/module-jar/pom.xml b/Goobi/module-jar/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>de.intranda.goobi.workflow</groupId>
         <artifactId>goobi-core</artifactId>
-        <version>23.04.3</version>
+        <version>23.05-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
 
     <groupId>de.intranda.goobi.workflow</groupId>
     <artifactId>goobi-core-jar</artifactId>
-    <version>23.04.3</version>
+    <version>23.05-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 

diff --git a/Goobi/module-war/pom.xml b/Goobi/module-war/pom.xml
@@ -4,14 +4,14 @@
     <parent>
         <groupId>de.intranda.goobi.workflow</groupId>
         <artifactId>goobi-core</artifactId>
-        <version>23.04.3</version>
+        <version>23.05-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
 
     <groupId>de.intranda.goobi.workflow</groupId>
     <artifactId>goobi-core-war</artifactId>
-    <version>23.04.3</version>
+    <version>23.05-SNAPSHOT</version>
     <packaging>war</packaging>
 
 

diff --git a/Goobi/pom.xml b/Goobi/pom.xml
@@ -4,7 +4,7 @@
     <groupId>de.intranda.goobi.workflow</groupId>
     <artifactId>goobi-core</artifactId>
     <!-- When updating the version, make sure to also update the version in the submodules -->
-    <version>23.04.3</version>
+    <version>23.05-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 
@@ -56,7 +56,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <publicVersion>23.04.3</publicVersion>
+        <publicVersion>23.05-SNAPSHOT</publicVersion>
         <!-- Use Java 11 for compiling -->
         <maven.compiler.release>11</maven.compiler.release>
 
@@ -75,7 +75,7 @@
 
         <!-- intranda internal -->
         <ics.version>3.9.0</ics.version>
-        <normdataimporter.version>1.9.4</normdataimporter.version>
+        <normdataimporter.version>1.10.1</normdataimporter.version>
         <ugh-core.version>5.0.14</ugh-core.version>
         <ugh-marc.version>1.3.2</ugh-marc.version>
         <ugh-lido.version>0.0.14</ugh-lido.version>
@@ -92,12 +92,12 @@
         <shiro.version>1.11.0</shiro.version>
         <activemq.version>5.18.1</activemq.version>
         <aspectj.version>1.9.9.1</aspectj.version>
-        <aws.version>1.12.450</aws.version>
+        <aws.version>1.12.475</aws.version>
         <bouncycastle.version>1.70</bouncycastle.version>
         <cdi.version>2.0.SP1</cdi.version>
         <commons-csv.version>1.10.0</commons-csv.version>
         <commons-dbcp2.version>2.9.0</commons-dbcp2.version>
-        <commons-io.version>2.11.0</commons-io.version>
+        <commons-io.version>2.12.0</commons-io.version>
         <!-- JXPath is used at XPathExpressionEngine from org.apache.commons.configuration2 -->
         <commons-jxpath.version>1.3</commons-jxpath.version>                
         <commons-net.version>3.9.0</commons-net.version>
@@ -109,11 +109,11 @@
         <gson.version>2.10.1</gson.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>
-        <imageio-openjpeg.version>0.6.6</imageio-openjpeg.version>
+        <imageio-openjpeg.version>0.6.7</imageio-openjpeg.version>
         <javassist.version>3.29.2-GA</javassist.version>
         <java-jwt.version>3.19.1</java-jwt.version>
         <jaxb-impl.version>2.3.8</jaxb-impl.version>
-        <jackson.version>2.14.2</jackson.version>
+        <jackson.version>2.15.1</jackson.version>
         <jersey.version>2.39.1</jersey.version>
         <jhove.version>1.20.1</jhove.version>
         <jna.version>5.11.0</jna.version>
@@ -122,18 +122,18 @@
         <jsonpath.version>2.8.0</jsonpath.version>
         <jwks-rsa.version>0.21.2</jwks-rsa.version>
         <log4j.version>2.19.0</log4j.version>
-        <lombok.version>1.18.26</lombok.version>
+        <lombok.version>1.18.28</lombok.version>
         <metadata-extractor.version>2.18.0</metadata-extractor.version>
         <mimepull.version>1.10.0</mimepull.version>
         <omnifaces.version>3.14.2</omnifaces.version>
         <openpdf.version>1.3.30</openpdf.version>
-        <pdfbox.version>2.0.27</pdfbox.version>
+        <pdfbox.version>2.0.28</pdfbox.version>
         <poi.version>5.2.3</poi.version>
         <powermock.version>2.0.9</powermock.version>
         <reflections.version>0.10.2</reflections.version>
         <spark.version>2.9.4</spark.version>
         <spring.version>5.3.27</spring.version>
-        <swagger.version>2.2.9</swagger.version>
+        <swagger.version>2.2.10</swagger.version>
         <weld.version>3.1.9.Final</weld.version>
         <hk2.version>2.6.1</hk2.version>
         <xmlbeans.version>5.1.1</xmlbeans.version>
@@ -854,7 +854,7 @@
 		<dependency>
 		    <groupId>software.aws.rds</groupId>
 		    <artifactId>aws-mysql-jdbc</artifactId>
-		    <version>1.1.4</version>
+		    <version>1.1.7</version>
 		</dependency>
 
         <dependency>
@@ -1320,7 +1320,7 @@
         <dependency>
             <groupId>de.intranda.goobi</groupId>
             <artifactId>alto</artifactId>
-            <version>1.5.9</version>
+            <version>1.5.10</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>