You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by so...@apache.org on 2026/09/03 10:06:17 UTC
(openjpa) 01/01: [OPENJPA-2976] there is no version 3.1 for persistense xml
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENJPA-2976-persistense-3.1
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit d5dca3c615fb15dab17c34108728449ab2ae7840
Author: Maxim Solodovnik <so...@apache.org>
AuthorDate: Thu Sep 3 17:05:55 2026 +0700
[OPENJPA-2976] there is no version 3.1 for persistense xml
---
.../openjpa/persistence/PersistenceProductDerivation.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
index 1ba0f0986..ddfefafa5 100644
--- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
@@ -296,7 +296,7 @@ public class PersistenceProductDerivation
}
return true;
}
-
+
/**
* Load configuration from the given persistence unit with the specified
* user properties.
@@ -326,7 +326,7 @@ public class PersistenceProductDerivation
PersistenceUnitInfoImpl pinfo = PersistenceUnitInfoImpl.convert(config);
return load(pinfo, props);
}
-
+
/**
* Load configuration from the given resource and unit names, which may
* be null.
@@ -669,7 +669,7 @@ public class PersistenceProductDerivation
_puNameCollisions.put(puName, new PUNameCollision(puName, file1, file2));
}
}
-
+
/**
* Custom configuration provider.
*/
@@ -857,10 +857,7 @@ public class PersistenceProductDerivation
|| (_schemaLocation != null && _schemaLocation.indexOf(PERSISTENCE_XSD_3_0) != -1)) {
persistencexsd = "persistence_3_0.xsd.rsrc";
}
- else if (XMLVersionParser.VERSION_3_1.equals(_persistenceVersion)
- || (_schemaLocation != null && _schemaLocation.indexOf(PERSISTENCE_XSD_3_0) != -1)) {
- persistencexsd = "persistence_3_0.xsd.rsrc";
- }
+ // According to https://jakarta.ee/xml/ns/persistence/ there is no version 3.1 for persistence.xsd
else if (XMLVersionParser.VERSION_3_2.equals(_persistenceVersion)
|| (_schemaLocation != null && _schemaLocation.indexOf(PERSISTENCE_XSD_3_2) != -1)) {
persistencexsd = "persistence_3_2.xsd.rsrc";
@@ -934,7 +931,7 @@ public class PersistenceProductDerivation
_info.addQualifierAnnotationNames(currentText());
}
break;
- case 's' :
+ case 's' :
if ("shared-cache-mode".equals(name)) {
_info.setSharedCacheMode(JPAProperties.getEnumValue(SharedCacheMode.class, currentText()));
} else if ("scope".equals(name)) {