Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: cea044ec698291b3f69b3298498fac5beafe72d0 https://github.com/hibernate/hibernate-orm/commit/cea044ec698291b3f69b329... Author: Vlad Mihalcea <mihalcea.vlad(a)gmail.com&gt; Date: 2021-05-25 (Tue, 25 May 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/engine/query/spi/QueryPlanCache.java M hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java M hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java M hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java M hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java Log Message: ----------- HHH-14632 - Call statistics.queryPlanCacheHit and statistics.queryPlanCacheMiss for FilterQueryPlan and NativeSQLQueryPlan Commit: 0c74a9263c154515eb97fe4df4dcc1f965901892 https://github.com/hibernate/hibernate-orm/commit/0c74a9263c154515eb97fe4... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-05-26 (Wed, 26 May 2021) Changed paths: M gradle/libraries.gradle Log Message: ----------- HHH-14635 Update to latest JUnit Commit: 07eca3883d13e4f5f898de15c8506c0fd2eecf1c https://github.com/hibernate/hibernate-orm/commit/07eca3883d13e4f5f898de1... Author: Yoann Rodière <yoann(a)hibernate.org&gt; Date: 2021-05-26 (Wed, 26 May 2021) Changed paths: M documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/features.xml M documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/features.xml M documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/features.xml R documentation/src/test/resources/log4j.properties A documentation/src/test/resources/log4j2.properties R etc/log4j.properties A etc/log4j2.properties M gradle/java-module.gradle M gradle/libraries.gradle R hibernate-agroal/src/test/resources/log4j.properties A hibernate-agroal/src/test/resources/log4j2.properties R hibernate-c3p0/src/test/resources/log4j.properties A hibernate-c3p0/src/test/resources/log4j2.properties M hibernate-core/src/test/java/org/hibernate/jpa/test/JpaProxyComplianceWithDebug.java M hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java M hibernate-core/src/test/java/org/hibernate/test/joinedsubclassbatch/JoinedSubclassBatchingTest.java M hibernate-core/src/test/java/org/hibernate/test/schemaupdate/ImplicitCompositeKeyJoinTest.java R hibernate-core/src/test/resources/log4j.properties A hibernate-core/src/test/resources/log4j2.properties R hibernate-ehcache/src/test/resources/log4j.properties A hibernate-ehcache/src/test/resources/log4j2.properties R hibernate-envers/src/test/resources/log4j.properties A hibernate-envers/src/test/resources/log4j2.properties R hibernate-hikaricp/src/test/resources/log4j.properties A hibernate-hikaricp/src/test/resources/log4j2.properties M hibernate-integrationtest-java-modules/src/test/resources/logging.properties R hibernate-jcache/src/test/resources/log4j.properties A hibernate-jcache/src/test/resources/log4j2.properties R hibernate-micrometer/src/test/resources/log4j.properties A hibernate-micrometer/src/test/resources/log4j2.properties M hibernate-osgi/src/test/resources/logging.properties R hibernate-proxool/src/test/resources/log4j.properties A hibernate-proxool/src/test/resources/log4j2.properties R hibernate-spatial/src/test/resources/log4j.properties A hibernate-spatial/src/test/resources/log4j2.properties M hibernate-testing-jakarta/hibernate-testing-jakarta.gradle M hibernate-testing/hibernate-testing.gradle R hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4DelegatingLogger.java A hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java M hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java M hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java M hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java R hibernate-vibur/src/test/resources/log4j.properties A hibernate-vibur/src/test/resources/log4j2.properties R tooling/metamodel-generator/src/test/resources/log4j.properties A tooling/metamodel-generator/src/test/resources/log4j2.properties Log Message: ----------- HHH-14635 Upgrade to log4j 2 Commit: 451568f3221fa0e8e53d4a7a1494954ae6dc04c4 https://github.com/hibernate/hibernate-orm/commit/451568f3221fa0e8e53d4a7... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2021-05-31 (Mon, 31 May 2021) Changed paths: M documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/features.xml M documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/features.xml M documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/features.xml R documentation/src/test/resources/log4j.properties A documentation/src/test/resources/log4j2.properties R etc/log4j.properties A etc/log4j2.properties M gradle/java-module.gradle M gradle/libraries.gradle R hibernate-agroal/src/test/resources/log4j.properties A hibernate-agroal/src/test/resources/log4j2.properties R hibernate-c3p0/src/test/resources/log4j.properties A hibernate-c3p0/src/test/resources/log4j2.properties M hibernate-core/hibernate-core.gradle M hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java M hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java M hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java M hibernate-core/src/test/java/org/hibernate/orm/test/jpa/JpaProxyComplianceWithDebugTest.java M hibernate-core/src/test/java/org/hibernate/orm/test/query/resultcache/QueryResultCacheTests.java M hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/ImplicitCompositeKeyJoinTest.java M hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/naturalid/ImmutableNaturalKeyLookupTest.java R hibernate-core/src/test/resources/log4j.properties A hibernate-core/src/test/resources/log4j2.properties A hibernate-ehcache/src/test/resources/log4j2.properties R hibernate-envers/src/test/resources/log4j.properties A hibernate-envers/src/test/resources/log4j2.properties R hibernate-hikaricp/src/test/resources/log4j.properties A hibernate-hikaricp/src/test/resources/log4j2.properties M hibernate-integrationtest-java-modules/src/test/resources/logging.properties R hibernate-jcache/src/test/resources/log4j.properties A hibernate-jcache/src/test/resources/log4j2.properties R hibernate-micrometer/src/test/resources/log4j.properties A hibernate-micrometer/src/test/resources/log4j2.properties R hibernate-proxool/src/test/resources/log4j.properties A hibernate-proxool/src/test/resources/log4j2.properties R hibernate-spatial/src/test/resources/log4j.properties A hibernate-spatial/src/test/resources/log4j2.properties M hibernate-testing-jakarta/hibernate-testing-jakarta.gradle M hibernate-testing/hibernate-testing.gradle R hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4DelegatingLogger.java A hibernate-testing/src/main/java/org/hibernate/testing/logger/Log4J2DelegatingLogger.java M hibernate-testing/src/main/java/org/hibernate/testing/logger/LogInspectionHelper.java M hibernate-testing/src/main/java/org/hibernate/testing/logger/TestableLoggerProvider.java M hibernate-testing/src/test/java/org/hibernate/testing/logger/LogDelegationTest.java R hibernate-vibur/src/test/resources/log4j.properties A hibernate-vibur/src/test/resources/log4j2.properties R tooling/metamodel-generator/src/test/resources/log4j.properties A tooling/metamodel-generator/src/test/resources/log4j2.properties Log Message: ----------- Merge remote-tracking branch 'upstream/main' into wip/6.0_merge_7 Commit: d413bdf2e9b4b6fda6e96cc21a6312fdd39bf691 https://github.com/hibernate/hibernate-orm/commit/d413bdf2e9b4b6fda6e96cc... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2021-05-31 (Mon, 31 May 2021) Changed paths: M hibernate-core/src/main/java/org/hibernate/stat/internal/QueryStatisticsImpl.java M hibernate-core/src/main/java/org/hibernate/stat/internal/StatisticsImpl.java M hibernate-core/src/main/java/org/hibernate/stat/spi/StatisticsImplementor.java M hibernate-core/src/test/java/org/hibernate/orm/test/stat/internal/QueryPlanCacheStatisticsTest.java A hibernate-core/src/test/java/org/hibernate/stat/internal/QueryPlanCacheStatisticsTest.java M hibernate-core/src/test/resources/log4j2.properties Log Message: ----------- Fix errors after merge with main Compare: https://github.com/hibernate/hibernate-orm/compare/2c6e000537fa...d413bdf...