Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: 55e54795c3726edf640b5823894276f3c379b317 https://github.com/hibernate/hibernate-orm/commit/55e54795c3726edf640b582... Author: Panagiotis Sotiropoulos <psotirop(a)redhat.com&gt; Date: 2020-04-21 (Tue, 21 Apr 2020) Changed paths: M hibernate-core/src/main/java/org/hibernate/internal/util/xml/XMLHelper.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java M hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestDataReader.java Log Message: ----------- HHH-13960 Add SAXReader sec features to match the defaults Commit: 6e07062b207cbf4ab0f1aecad6b8482ff2f8ff4b https://github.com/hibernate/hibernate-orm/commit/6e07062b207cbf4ab0f1aec... Author: Panagiotis Sotiropoulos <psotirop(a)redhat.com&gt; Date: 2020-04-21 (Tue, 21 Apr 2020) Changed paths: M hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestDataReader.java Log Message: ----------- HHH-13960 One more checkstyle fix Commit: cecaeb92b3d0c70d6326671692b0b38aa60e0d34 https://github.com/hibernate/hibernate-orm/commit/cecaeb92b3d0c70d6326671... Author: Sanne Grinovero <sanne(a)hibernate.org&gt; Date: 2020-04-21 (Tue, 21 Apr 2020) Changed paths: M gradle/libraries.gradle R hibernate-jipijapa/hibernate-jipijapa.gradle R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/HibernateArchiveScanner.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/HibernateExtendedBeanManager.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/HibernatePersistenceProviderAdaptor.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/JBossAppServerJtaPlatform.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/JpaLogger.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/TwoPhaseBootstrapImpl.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/VirtualFileInputStreamAccess.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/VirtualFileSystemArchiveDescriptor.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/VirtualFileSystemArchiveDescriptorFactory.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateAbstractStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateCollectionStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateEntityCacheStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateEntityStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateManagementAdaptor.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateQueryCacheStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/QueryName.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/service/CustomJtaPlatformInitiator.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/service/CustomRegionFactoryInitiator.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/service/ServiceContributorImpl.java R hibernate-jipijapa/src/main/resources/META-INF/services/org.hibernate.service.spi.ServiceContributor R hibernate-jipijapa/src/main/resources/META-INF/services/org.jipijapa.plugin.spi.PersistenceProviderAdaptor R hibernate-jipijapa/src/main/resources/org/jboss/as/jpa/hibernate5/management/LocalDescriptions.properties R hibernate-jipijapa/src/test/bundles/cfgxmlpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/cfgxmlpar/org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml R hibernate-jipijapa/src/test/bundles/defaultpar/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/defaultpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/defaultpar/org/hibernate/jpa/test/pack/defaultpar/Mouse.hbm.xml R hibernate-jipijapa/src/test/bundles/defaultpar_1_0/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/defaultpar_1_0/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.hbm.xml R hibernate-jipijapa/src/test/bundles/excludehbmpar/META-INF/orm2.xml R hibernate-jipijapa/src/test/bundles/excludehbmpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/excludehbmpar/org/hibernate/jpa/test/pack/excludehbmpar/Mouse.hbm.xml R hibernate-jipijapa/src/test/bundles/explicitpar/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/explicitpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/explodedpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/explodedpar/org/hibernate/jpa/test/pack/explodedpar/Elephant.hbm.xml R hibernate-jipijapa/src/test/bundles/externaljar/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/overridenpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/overridenpar/overridenpar.properties R hibernate-jipijapa/src/test/bundles/space par/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/war/WEB-INF/classes/org/hibernate/jpa/test/pack/war/Mouse.hbm.xml R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/Cat.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/Distributor.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/Item.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/Kitten.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/LastUpdateListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Lighter.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/OtherIncrementListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/package-info.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Elephant.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explodedpar/package-info.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/various/Airplane.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/various/Seat.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/Lighter.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/Money.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/OtherIncrementListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/Version.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/package-info.java R hibernate-jipijapa/src/test/java/org/jboss/as/jpa/hibernate5/scan/ScannerTests.java R hibernate-jipijapa/src/test/resources/org/hibernate/jpa/test/packaging/empty.txt R hibernate-jipijapa/src/test/resources/org/hibernate/jpa/test/packaging/loremipsum.txt M settings.gradle Log Message: ----------- HHH-13963 Remove the JipiJapa fork Commit: 9ec19e3c652481aed7eafe909e43b1547f3ed7d0 https://github.com/hibernate/hibernate-orm/commit/9ec19e3c652481aed7eafe9... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-04-22 (Wed, 22 Apr 2020) Changed paths: M gradle/libraries.gradle M hibernate-core/src/main/java/org/hibernate/internal/util/xml/XMLHelper.java M hibernate-core/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java R hibernate-jipijapa/hibernate-jipijapa.gradle R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/HibernateArchiveScanner.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/HibernateExtendedBeanManager.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/HibernatePersistenceProviderAdaptor.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/JBossAppServerJtaPlatform.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/JpaLogger.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/TwoPhaseBootstrapImpl.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/VirtualFileInputStreamAccess.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/VirtualFileSystemArchiveDescriptor.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/VirtualFileSystemArchiveDescriptorFactory.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateAbstractStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateCollectionStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateEntityCacheStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateEntityStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateManagementAdaptor.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateQueryCacheStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/HibernateStatistics.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/management/QueryName.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/service/CustomJtaPlatformInitiator.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/service/CustomRegionFactoryInitiator.java R hibernate-jipijapa/src/main/java/org/jboss/as/jpa/hibernate5/service/ServiceContributorImpl.java R hibernate-jipijapa/src/main/resources/META-INF/services/org.hibernate.service.spi.ServiceContributor R hibernate-jipijapa/src/main/resources/META-INF/services/org.jipijapa.plugin.spi.PersistenceProviderAdaptor R hibernate-jipijapa/src/main/resources/org/jboss/as/jpa/hibernate5/management/LocalDescriptions.properties R hibernate-jipijapa/src/test/bundles/cfgxmlpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/cfgxmlpar/org/hibernate/jpa/test/pack/cfgxmlpar/hibernate.cfg.xml R hibernate-jipijapa/src/test/bundles/defaultpar/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/defaultpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/defaultpar/org/hibernate/jpa/test/pack/defaultpar/Mouse.hbm.xml R hibernate-jipijapa/src/test/bundles/defaultpar_1_0/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/defaultpar_1_0/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/defaultpar_1_0/org/hibernate/jpa/test/pack/defaultpar_1_0/Mouse1.hbm.xml R hibernate-jipijapa/src/test/bundles/excludehbmpar/META-INF/orm2.xml R hibernate-jipijapa/src/test/bundles/excludehbmpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/excludehbmpar/org/hibernate/jpa/test/pack/excludehbmpar/Mouse.hbm.xml R hibernate-jipijapa/src/test/bundles/explicitpar/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/explicitpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/explodedpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/explodedpar/org/hibernate/jpa/test/pack/explodedpar/Elephant.hbm.xml R hibernate-jipijapa/src/test/bundles/externaljar/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/overridenpar/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/overridenpar/overridenpar.properties R hibernate-jipijapa/src/test/bundles/space par/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/war/WEB-INF/classes/META-INF/orm.xml R hibernate-jipijapa/src/test/bundles/war/WEB-INF/classes/META-INF/persistence.xml R hibernate-jipijapa/src/test/bundles/war/WEB-INF/classes/org/hibernate/jpa/test/pack/war/Mouse.hbm.xml R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/Cat.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/Distributor.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/Item.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/Kitten.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/LastUpdateListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/cfgxmlpar/Morito.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/ApplicationServer.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/IncrementListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Lighter.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Money.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Mouse.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/OtherIncrementListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/Version.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/defaultpar/package-info.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/excludehbmpar/Caipirinha.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explicitpar/Washer.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Carpet.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explodedpar/Elephant.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/explodedpar/package-info.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/externaljar/Scooter.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/overridenpar/Bug.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/spacepar/Bug.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/various/Airplane.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/various/Seat.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/ApplicationServer.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/IncrementListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/Lighter.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/Money.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/Mouse.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/OtherIncrementListener.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/Version.java R hibernate-jipijapa/src/test/java/org/hibernate/jpa/test/pack/war/package-info.java R hibernate-jipijapa/src/test/java/org/jboss/as/jpa/hibernate5/scan/ScannerTests.java R hibernate-jipijapa/src/test/resources/org/hibernate/jpa/test/packaging/empty.txt R hibernate-jipijapa/src/test/resources/org/hibernate/jpa/test/packaging/loremipsum.txt M hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestDataReader.java M settings.gradle Log Message: ----------- Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_36 Compare: https://github.com/hibernate/hibernate-orm/compare/5d9c25c318d7...9ec19e3...