MCR-3585 update dependencies

mycore-base/pom.xml

@@ -438,7 +438,7 @@
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-servlet-core</artifactId>
+      <artifactId>jersey-container-servlet</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

mycore-base/src/main/java/org/mycore/backend/jpa/MCRJPAConfigurationCheck.java

@@ -20,19 +20,24 @@
 
 import static org.mycore.backend.jpa.MCRPersistenceProvider.JPA_PERSISTENCE_UNIT_PROPERTY_NAME;
 
+import java.net.URL;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor;
-import org.hibernate.jpa.boot.internal.PersistenceXmlParser;
+import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor;
+import org.hibernate.jpa.boot.spi.PersistenceXmlParser;
 import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.common.config.MCRInstanceName;
 import org.mycore.common.events.MCRStartupHandler.AutoExecutable;
+import org.mycore.resource.MCRResourceResolver;
+import org.mycore.resource.provider.MCRResourceProvider;
 
 import jakarta.servlet.ServletContext;
 
@@ -82,10 +87,7 @@ private void performConfigurationChecks() {
         LOGGER.trace(() -> "*** Persistence units configured in MyCoRe properties: "
             + String.join(", ", unitsFromMycoreProperties) + " ***");
 
-        Set<String> unitsFromPersistenceXml = PersistenceXmlParser.locatePersistenceUnits(Collections.emptyMap())
-            .stream()
-            .map(ParsedPersistenceXmlDescriptor::getName)
-            .collect(Collectors.toSet());
+        Set<String> unitsFromPersistenceXml = locatePersistenceUnitNamesFromPersistenceXml();
 
         LOGGER.trace(() -> "*** Persistence units configured in persistence.xml: "
             + String.join(", ", unitsFromPersistenceXml) + " ***");
@@ -117,6 +119,29 @@ private void performConfigurationChecks() {
 
     }
 
+    private Set<String> locatePersistenceUnitNamesFromPersistenceXml() {
+        List<URL> persistenceXmlUrls = MCRResourceResolver.obtainInstance()
+            .resolveAllResource("META-INF/persistence.xml")
+            .stream()
+            .map(MCRResourceProvider.ProvidedUrl::url)
+            .toList();
+        if (persistenceXmlUrls.isEmpty()) {
+            return Collections.emptySet();
+        }
+
+        try {
+            Map<String, PersistenceUnitDescriptor> descriptors =
+                PersistenceXmlParser.create(Collections.emptyMap()).parse(persistenceXmlUrls);
+
+            return descriptors.values().stream()
+                .map(PersistenceUnitDescriptor::getName)
+                .collect(Collectors.toSet());
+        } catch (RuntimeException e) {
+            LOGGER.warn("Could not parse persistence.xml files for configuration check.", e);
+            return Collections.emptySet();
+        }
+    }
+
     private static Set<String> intersect(Set<String> set1, Set<String> set2) {
         Set<String> intersection = new HashSet<>(set1);
         intersection.retainAll(set2);

mycore-base/src/main/java/org/mycore/backend/jpa/MCRPersistenceProvider.java

@@ -23,6 +23,7 @@
 import java.util.Optional;
 import java.util.concurrent.Callable;
 
+import jakarta.persistence.PersistenceConfiguration;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
@@ -100,7 +101,7 @@ private static void logJPAProperties(MCRPersistenceUnitDescriptor puDescriptor)
         Optional.ofNullable(puDescriptor.getProviderClassName())
             .ifPresent((provider) -> table.add(new Property("ProviderClassName", provider)));
 
-        Optional.ofNullable(puDescriptor.getTransactionType())
+        Optional.ofNullable(puDescriptor.getPersistenceUnitTransactionType())
             .ifPresent((transactionType) -> table.add(new Property("TransactionType", transactionType.name())));
 
         Optional.ofNullable(puDescriptor.getValidationMode())
@@ -163,6 +164,11 @@ public boolean generateSchema(String persistenceUnitName, Map map) {
         return false;
     }
 
+    @Override
+    public EntityManagerFactory createEntityManagerFactory(PersistenceConfiguration persistenceConfiguration) {
+        return null;
+    }
+
     @Override
     public ProviderUtil getProviderUtil() {
         return providerUtil;

mycore-base/src/main/java/org/mycore/backend/jpa/MCRPersistenceUnitDescriptor.java

@@ -36,9 +36,9 @@
 import org.mycore.common.config.annotation.MCRProperty;
 import org.mycore.common.config.annotation.MCRRawProperties;
 
+import jakarta.persistence.PersistenceUnitTransactionType;
 import jakarta.persistence.SharedCacheMode;
 import jakarta.persistence.ValidationMode;
-import jakarta.persistence.spi.PersistenceUnitTransactionType;
 
 public class MCRPersistenceUnitDescriptor implements PersistenceUnitDescriptor {
 
@@ -126,13 +126,23 @@ public boolean isExcludeUnlistedClasses() {
         return excludeUnlistedClasses;
     }
 
+    @Override
+    public PersistenceUnitTransactionType getPersistenceUnitTransactionType() {
+        return transactionType;
+    }
+
     public void setExcludeUnlistedClasses(boolean excludeUnlistedClasses) {
         this.excludeUnlistedClasses = excludeUnlistedClasses;
     }
 
     @Override
-    public PersistenceUnitTransactionType getTransactionType() {
-        return transactionType;
+    @Deprecated(forRemoval = true)
+    @SuppressWarnings({"deprecation","removal"})
+    public jakarta.persistence.spi.PersistenceUnitTransactionType getTransactionType() {
+        return switch (transactionType) {
+            case JTA -> jakarta.persistence.spi.PersistenceUnitTransactionType.JTA;
+            case RESOURCE_LOCAL -> jakarta.persistence.spi.PersistenceUnitTransactionType.RESOURCE_LOCAL;
+        };
     }
 
     public void setTransactionType(PersistenceUnitTransactionType transactionType) {