ref #10277 try to fix HibernateSystemException handling

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 453894be825a88dc4af200d418730326617b2a6c..aa671c5ed868e4c4d0d213056156dcbca72765e8 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -392,6 +392,7 @@ Bundle-ClassPath: .,
  lib/spring-security-core-4.2.20.RELEASE.jar,
  lib/spring-tx-4.3.30.RELEASE.jar,
  lib/spring-web-4.3.30.RELEASE.jar,
+ lib/spring-orm-4.3.30.RELEASE.jar,
  lib/tools.jar,
  lib/jakarta.validation-api-3.0.2.jar,
  lib/validation-api-2.0.1.Final.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 3d89f667e4f07fa921944974a55b4ed8f27bc98f..a25d064e6cbb1f5987ad96d7e2d4a7b49575860f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -50,6 +50,7 @@ bin.includes = META-INF/,\
                lib/spring-security-core-4.2.20.RELEASE.jar,\
                lib/spring-tx-4.3.30.RELEASE.jar,\
                lib/spring-web-4.3.30.RELEASE.jar,\
+               lib/spring-orm-4.3.30.RELEASE.jar,\
                lib/tools.jar,\
                lib/jakarta.validation-api-3.0.2.jar,\
                lib/validation-api-2.0.1.Final.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 09050b4fe6fd63af4c62f9d750818fef18cb666a..fa5e995c558b923e619ee2cefec3f81e622e66fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -74,7 +74,8 @@
                 hibernate-validator,\r
                 spring-context,spring-aspects,spring-beans,\r
                 spring-tx,spring-web,spring-core,spring-aop,\r
-                spring-jdbc,spring-security-core,\r
+                spring-jdbc,spring-orm,\r
+                spring-security-core,\r
                 aspectjweaver,\r
                 byte-buddy,\r
                 hibernate-core,hibernate-envers,antlr,\r
@@ -476,6 +477,13 @@
     \r
     <!-- required during RUNTIME -->\r
     \r
+    <dependency>\r
+      <!-- for handling HibernateSystemException, see #10277, TODO try to handle without adding dependency  -->\r
+      <groupId>org.springframework</groupId>\r
+      <artifactId>spring-orm</artifactId>\r
+      <version>${spring.version}</version>\r
+    </dependency>\r
+  \r
     <dependency>\r
       <!-- throws exception in bulk editor after search if not present -->\r
       <groupId>org.hibernate</groupId>\r