ref #10067, #10070 reassign javassist as bytecode provider in cdmlib

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java
index eb8f2fabcec912b1b64fe2e69b9664bde5dcd523..3b6b05f860215eb6170791c15a2044bb8aa22e1b 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java
@@ -163,6 +163,7 @@ public class CdmPersistentDataSourceTest {
                assertEquals(NoCachingRegionFactory.class.getName(), properties.getProperty("hibernate.cache.region.factory_class"));
                assertEquals(String.valueOf(false), properties.getProperty("hibernate.show_sql"));
                assertEquals(String.valueOf(false), properties.getProperty("hibernate.format_sql"));
+               assertEquals(HibernateConfiguration.BYTECODE_PROVIDER_DEFAULT, properties.getProperty("hibernate.bytecode.provider"));
 
                //null
                beanDef = dataSource.getHibernatePropertiesBean(null);
@@ -201,6 +202,7 @@ public class CdmPersistentDataSourceTest {
                assertEquals(cacheProviderClass.getName(), properties.getProperty("hibernate.cache.region.factory_class"));
                assertEquals(String.valueOf(showSql), properties.getProperty("hibernate.show_sql"));
                assertEquals(String.valueOf(formatSql), properties.getProperty("hibernate.format_sql"));
+               assertEquals(HibernateConfiguration.BYTECODE_PROVIDER_DEFAULT, properties.getProperty("hibernate.bytecode.provider"));
        }
 
        @Test

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testPersistentDataSource.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testPersistentDataSource.xml
index 1adfea8a5d05f779667ff4076b7612fea57a2af6..0e2e95c1e1495694f12a57734c296be32fb79570 100644 (file)
--- a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testPersistentDataSource.xml
+++ b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testPersistentDataSource.xml
@@ -28,6 +28,7 @@
                 <prop key="hibernate.format_sql">false</prop>
                 <prop key="hibernate.search.default.directory_provider">org.hibernate.search.store.impl.FSDirectoryProvider</prop>
                 <prop key="hibernate.search.default.indexBase">./target/test-classes</prop>
+                <prop key="hibernate.bytecode.provider">javassist</prop>
             </props>
         </property>
     </bean> 

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml
index 36940f0a336b3fc57937f9759d1531c13ee83e60..99786a980837fc5ef15df426a39ef0b4d4a95baa 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml
@@ -26,6 +26,7 @@
               <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>\r
               <prop key="hibernate.show_sql">false</prop>\r
               <prop key="hibernate.format_sql">false</prop>\r
+              <prop key="hibernate.bytecode.provider">javassist</prop>\r
               <prop key="hibernate.search.default.directory_provider">org.hibernate.search.store.impl.FSDirectoryProvider</prop>\r
               <prop key="hibernate.search.default.indexBase">${eu.etaxonomy.cdm.search.index.path}</prop><!-- set in applicationContext.xml -->\r
 \r

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml
index 214dabca5da73ca85b6d24f365f328bf112e44c7..d098b9073744f5196482007c2c5de79483575e1c 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml
@@ -48,6 +48,7 @@
                 <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>\r
                 <prop key="hibernate.show_sql">true</prop>\r
                 <prop key="hibernate.format_sql">false</prop>\r
+                <prop key="hibernate.bytecode.provider">javassist</prop>\r
             </props>\r
         </property>\r
     </bean>\r

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml
index df9a0041674139232b734edd7004bafc234cddf9..fec76b422dce1f1ff74437710736162e5331c228 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml
@@ -33,6 +33,7 @@
                 <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>\r
                 <prop key="hibernate.show_sql">false</prop>\r
                 <prop key="hibernate.format_sql">false</prop>\r
+                <prop key="hibernate.bytecode.provider">javassist</prop>\r
             </props>\r
         </property>\r
     </bean>\r

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml
index 476a05c6d50076f1566979e23683d0dfecc80263..45b0aca5b1771d8c55c273997dfc92125f3b013a 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml
@@ -66,6 +66,7 @@
               <prop key="hibernate.cache.region.factory_class">org.hibernate.cache.internal.NoCachingRegionFactory</prop>\r
               <prop key="hibernate.show_sql">false</prop>\r
               <prop key="hibernate.format_sql">false</prop>\r
+              <prop key="hibernate.bytecode.provider">javassist</prop>\r
               <prop key="hibernate.search.default.indexBase">${user.home}/.cdmLibrary/</prop>\r
             </props>\r
         </property>\r

diff --git a/cdmlib-remote-webapp/src/test/resources/hibernate.properties b/cdmlib-remote-webapp/src/test/resources/hibernate.properties
index 698be6e092c7427552c8502fbd4b881356cfa57a..a96dff390b141a04f09b951e0ee3793ffb8053ab 100644 (file)
--- a/cdmlib-remote-webapp/src/test/resources/hibernate.properties
+++ b/cdmlib-remote-webapp/src/test/resources/hibernate.properties
@@ -11,4 +11,6 @@
 #hibernate.show_sql=true
 
 # hibernate.format_sql - default: false
-#hibernate.format_sql=true
\ No newline at end of file
+#hibernate.format_sql=true
+
+#hibernate.bytecode.provider=javassist
\ No newline at end of file

diff --git a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml
index 2056635f96779626c283a16da82c844183fcfa17..94dfcf080d282c2c9fc150e4f0361b30f5089c56 100644 (file)
--- a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml
+++ b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml
@@ -62,6 +62,7 @@
                       locks must not only be released after application shutdown in test environment -->
                 <prop key="hibernate.search.default.exclusive_index_use">false</prop>
                 <prop key="hibernate.dialect">org.hibernate.dialect.H2CorrectedDialectTest</prop>
+                <prop key="hibernate.bytecode.provider">javassist</prop>                
                 <prop key="implicitNamingStrategy">org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl"</prop>
             </props>
         </property>

diff --git a/pom.xml b/pom.xml
index b7fd9888a5b618fde01fc1e693d44033eb8da985..e86d4b45733046f116e2d3baecbcc75621983896 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1387,12 +1387,13 @@
         <version>${hibernate-search.version}</version>
       </dependency>
       <dependency>
-        <!-- TODO can be removed, not used anymore by hibernate, but still a dependency in 5.4.x -->
+        <!-- TODO can be removed when upgraded to bytebuddy, not used anymore by hibernate, but still a dependency in 5.4.x -->
         <groupId>org.javassist</groupId>
         <artifactId>javassist</artifactId>
         <version>3.29.0-GA</version>
       </dependency>
       <dependency>
+        <!-- TODO not yet required as we still use javassist -->
         <groupId>net.bytebuddy</groupId>
         <artifactId>byte-buddy</artifactId>
         <version>1.12.10</version>