diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c43b15570..73dc981a31 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
export FIREFOX_BIN=$(which firefox-esr)
export SELENIUM_BROWSER=firefox
- mvn -B -P!standard-with-extra-repos -Djetty clean install
+ mvn -B -P!standard-with-extra-repos -U -Djetty clean install
mvn -P!standard-with-extra-repos -B javadoc:javadoc
- name: Login to Docker Hub
if: contains('refs/heads/2022.06.x refs/heads/main', github.ref) && github.event_name=='push' && success()
diff --git a/mir-it/pom.xml b/mir-it/pom.xml
index b64507a029..d1c55a64ac 100644
--- a/mir-it/pom.xml
+++ b/mir-it/pom.xml
@@ -81,7 +81,7 @@
com.h2database
h2
- 1.3.176
+ 2.2.224
diff --git a/mir-it/src/test/integration/resources/META-INF/persistence.xml b/mir-it/src/test/integration/resources/META-INF/persistence.xml
index 8e5a661b3e..3b84c0f8f6 100644
--- a/mir-it/src/test/integration/resources/META-INF/persistence.xml
+++ b/mir-it/src/test/integration/resources/META-INF/persistence.xml
@@ -1,8 +1,8 @@
-
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+ version="3.1">
META-INF/mycore-base-mappings.xml
@@ -14,10 +14,10 @@
META-INF/mir-module-mappings.xml
-
-
-
-
+
+
+
+
diff --git a/mir-module/src/main/java/org/mycore/mir/MIRClassificationServlet.java b/mir-module/src/main/java/org/mycore/mir/MIRClassificationServlet.java
index d28b65b34b..a7550c4c10 100644
--- a/mir-module/src/main/java/org/mycore/mir/MIRClassificationServlet.java
+++ b/mir-module/src/main/java/org/mycore/mir/MIRClassificationServlet.java
@@ -82,7 +82,7 @@ private static void chooseCategory(HttpServletRequest request) {
Element rootElement = getRootElement(request);
rootElement.setAttribute("classID", categoryID.getRootID());
if (!categoryID.isRootID()) {
- rootElement.setAttribute("categID", categoryID.getID());
+ rootElement.setAttribute("categID", categoryID.getId());
}
request.setAttribute(LAYOUT_ELEMENT_KEY, new Document(rootElement));
}
diff --git a/mir-module/src/main/java/org/mycore/mir/index/MirPathDocumentFactory.java b/mir-module/src/main/java/org/mycore/mir/index/MirPathDocumentFactory.java
index 7209f7c641..d50efaca96 100644
--- a/mir-module/src/main/java/org/mycore/mir/index/MirPathDocumentFactory.java
+++ b/mir-module/src/main/java/org/mycore/mir/index/MirPathDocumentFactory.java
@@ -59,7 +59,7 @@ public SolrInputDocument getDocument(Path input, BasicFileAttributes attr) {
LOGGER.warn("No status set for " + objId + ", could not set for MCRFile: " + input);
return document;
}
- document.setField(status.getRootID(), status.getID());
+ document.setField(status.getRootID(), status.getId());
return document;
}
diff --git a/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202006Utils.java b/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202006Utils.java
index f076a4ced4..ada4aac080 100644
--- a/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202006Utils.java
+++ b/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202006Utils.java
@@ -135,7 +135,7 @@ public static void harmonizeDerivatesGenre(String id) {
0,
null,
derivateTypeId.getRootID(),
- derivateTypeId.getID()
+ derivateTypeId.getId()
);
object.getStructure().getDerivates().forEach(derivateLink -> {
diff --git a/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202206Utils.java b/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202206Utils.java
index a7c2837df1..f0ae74ddc6 100644
--- a/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202206Utils.java
+++ b/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202206Utils.java
@@ -109,7 +109,7 @@ private static void fixModsNameIdentifier(String classification, MCRCategoryID r
MCRCategory category = foundCategoryByLabel.iterator().next();
LOGGER.info("Found single matching category: " + category.toString());
- nameIdentifier.setAttribute("type", category.getId().getID());
+ nameIdentifier.setAttribute("type", category.getId().getId());
update.set(true);
if (nameIdentifier.getAttributeValue("typeURI") != null) {
diff --git a/mir-module/src/main/java/org/mycore/mir/sword2/MIRDeepGreepIngester.java b/mir-module/src/main/java/org/mycore/mir/sword2/MIRDeepGreepIngester.java
index 31d9248735..f0c3d5caad 100644
--- a/mir-module/src/main/java/org/mycore/mir/sword2/MIRDeepGreepIngester.java
+++ b/mir-module/src/main/java/org/mycore/mir/sword2/MIRDeepGreepIngester.java
@@ -109,7 +109,7 @@ public MCRObjectID ingestMetadata(Deposit deposit) throws SwordError, SwordServe
0,
null,
derivateTypeId.getRootID(),
- derivateTypeId.getID()
+ derivateTypeId.getId()
);
derivate.getDerivate().getClassifications().add(derivateTypeClassification);
}
diff --git a/mir-module/src/test/resources/META-INF/persistence.xml b/mir-module/src/test/resources/META-INF/persistence.xml
index f5a93d1c10..3cc57420f5 100644
--- a/mir-module/src/test/resources/META-INF/persistence.xml
+++ b/mir-module/src/test/resources/META-INF/persistence.xml
@@ -1,8 +1,8 @@
-
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+ version="3.1">
META-INF/mycore-acl-mappings.xml
@@ -11,10 +11,10 @@
META-INF/mycore-pi-mappings.xml
META-INF/mir-module-mappings.xml
-
-
-
-
+
+
+
+
diff --git a/mir-wizard/src/main/resources/setup/dbtypes.xml b/mir-wizard/src/main/resources/setup/dbtypes.xml
index f536205a50..9125b5b1f9 100644
--- a/mir-wizard/src/main/resources/setup/dbtypes.xml
+++ b/mir-wizard/src/main/resources/setup/dbtypes.xml
@@ -5,15 +5,15 @@
jdbc:h2:file:{PATH}/h2/mir
sa
- https://repo.maven.apache.org/maven2/com/h2database/h2/1.4.200/h2-1.4.200.jar
+ https://repo1.maven.org/maven2/com/h2database/h2/2.2.224/h2-2.2.224.jar
org.postgresql.Driver
jdbc:postgresql://127.0.0.1/mir
- https://jdbc.postgresql.org/download/postgresql-42.2.9.jar
- https://repo.maven.apache.org/maven2/org/postgresql/postgresql/42.2.9/postgresql-42.2.9.jar
+ https://jdbc.postgresql.org/download/postgresql-42.6.0.jar
+ https://repo1.maven.org/maven2/org/postgresql/postgresql/42.6.0/postgresql-42.6.0.jar
@@ -21,21 +21,21 @@
jdbc:hsqldb:hsql://localhost:8298/mir
sa
- https://repo.maven.apache.org/maven2/org/hsqldb/hsqldb/2.5.0/hsqldb-2.5.0.jar
+ https://repo1.maven.org/maven2/org/hsqldb/hsqldb/2.7.2/hsqldb-2.7.2.jar
org.mariadb.jdbc.Driver
jdbc:mariadb://127.0.0.1/mir
- https://repo.maven.apache.org/maven2/org/mariadb/jdbc/mariadb-java-client/2.5.4/mariadb-java-client-2.5.4.jar
+ https://repo1.maven.org/maven2/org/mariadb/jdbc/mariadb-java-client/3.2.0/mariadb-java-client-3.2.0.jar
com.mysql.jdbc.Driver
jdbc:mysql://127.0.0.1/mir
- https://repo.maven.apache.org/maven2/mysql/mysql-connector-java/8.0.19/mysql-connector-java-8.0.19.jar
+ https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.1.0/mysql-connector-j-8.1.0.jar
-
\ No newline at end of file
+
diff --git a/mir-wizard/src/main/resources/setup/template-persistence.xml b/mir-wizard/src/main/resources/setup/template-persistence.xml
index 4fa6e7c8bd..d7f9cf9806 100644
--- a/mir-wizard/src/main/resources/setup/template-persistence.xml
+++ b/mir-wizard/src/main/resources/setup/template-persistence.xml
@@ -1,8 +1,8 @@
-
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+ version="3.1">
META-INF/mycore-base-mappings.xml
META-INF/mycore-iview2-mappings.xml
diff --git a/mir-wizard/src/test/resources/META-INF/persistence.xml b/mir-wizard/src/test/resources/META-INF/persistence.xml
index d9f4f8d3c6..1e9e9429dd 100644
--- a/mir-wizard/src/test/resources/META-INF/persistence.xml
+++ b/mir-wizard/src/test/resources/META-INF/persistence.xml
@@ -1,16 +1,16 @@
-
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd"
+ version="3.1">
META-INF/mycore-base-mappings.xml
-
-
-
-
+
+
+
+