Merge remote-tracking branch 'upstream/main' into main-perf

Author: theigl

.github/workflows/codeql.yml

@@ -0,0 +1,63 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ 'main' ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ 'main' ]
+  schedule:
+    - cron: '34 11 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          queries: +security-and-quality
+
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+      # - run: |
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{matrix.language}}"

README.adoc

@@ -5,8 +5,7 @@ It also provides an implementation of the JPA specification, which is the standa
 
 This is the repository of its source code; see https://hibernate.org/orm/[Hibernate.org] for additional information.
 
-image:https://ci.hibernate.org/job/hibernate-orm-main-h2-main/badge/icon[Build Status,link=https://ci.hibernate.org/job/hibernate-orm-main-h2-main/]
-image:https://img.shields.io/lgtm/grade/java/g/hibernate/hibernate-orm.svg?logo=lgtm&logoWidth=18[Language grade: Java,link=https://lgtm.com/projects/g/hibernate/hibernate-orm/context:java]
+image:https://ci.hibernate.org/job/hibernate-orm-pipeline/job/main/badge/icon[Build Status,link=https://ci.hibernate.org/job/hibernate-orm-pipeline/job/main/]
 image:https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A[link=https://ge.hibernate.org/scans]
 
 == Continuous Integration

changelog.txt

@@ -3,6 +3,68 @@ Hibernate 6 Changelog
 
 Note: Please refer to JIRA to learn more about each issue.
 
+Changes in 6.2.0.CR1 (December 22, 2022)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/32077
+
+** Bug
+    * [HHH-15900] - ID attributes  with "select" generator are mapped to identity columns
+    * [HHH-15847] - DDL check constraint creation broken
+    * [HHH-15828] - setting TIMEZONE_DEFAULT_STORAGE to COLUMN does not work
+    * [HHH-15820] - inconsistent DDL generated Instant and ZonedDateTime, OffsetDateTime on Oracle
+    * [HHH-15819] - extract(offset hour|minute from datetime) are broken
+    * [HHH-15814] - Add missing current timestamp methods in CockroachDB  dialect 
+    * [HHH-15801] - IdentifierGeneratorHelper should compare column names case insensitively
+    * [HHH-15775] - Connection error can result in UnknownServiceException, hiding actual exception
+    * [HHH-15767] - missing unique constraints from optional @OneToOne
+    * [HHH-15750] - Hibernate.isInitialized() broken for EnhancementAsProxyLazinessInterceptor
+    * [HHH-15748] - Use JSON DDL type on Oracle 21+ and BLOB on 12+
+    * [HHH-15741] - Explicit declaration assigned identifier generator does not work
+    * [HHH-15715] - broken links in 6 docs
+    * [HHH-15709] - HQL local datetime literals on Postgres, Cockroach H2
+    * [HHH-15704] - ManyToManyTest produces invalid foreign keys
+    * [HHH-15689] - SessionFactoryOptionsBuilder.addEntityNameResolvers() has no effect
+    * [HHH-15687] - IllegalArgumentException with Type parameters and multiple bounds
+    * [HHH-15682] - static final instances of LockOptions are mutable
+    * [HHH-15679] - Respect the offset of OffsetTime when persisting/loading data
+    * [HHH-15670] - RequiresDialectFeature.reverse() not implemented
+    * [HHH-15669] - Oracle 21 and 11 spatial test failure
+    * [HHH-15668] - Cockroach test failure: BatchOptimisticLockingTest.testBatchAndOptimisticLocking
+    * [HHH-15634] - Lazy basic property does not get updated on change
+    * [HHH-15627] - useless error message of multi-@JoinColumn mapping does not specify referencedColumnName
+    * [HHH-15571] - Bundle-Manifest has no 'Bundle-Version'
+    * [HHH-15565] - @Table(fetch=SELECT) is gone from H6
+    * [HHH-15549] - incorrect DDL mapping DECIMAL -> BOOLEAN on Oracle
+    * [HHH-15545] - @NotFound(Ignore) defaults to eager loading
+    * [HHH-15522] - Hibernate.isInitialized method not working for Envers Collections
+    * [HHH-15505] - Getter of loaded entity returns null when using bytecode enhancement on entity whose field is defined both in mapped superclass and concrete entity
+    * [HHH-15485] - Tests for Collections in default FetchGroup are not enabling this property
+    * [HHH-15463] - Adjust JdbcType based on DDL capacity for varchar/varbinary like types
+    * [HHH-15159] - Orphan removal of an entity with an @ElementCollection causes a ConstraintViolationException
+
+** Deprecation
+    * [HHH-15788] - deprecate GenerationTime
+    * [HHH-15772] - deprecate @Target, @Proxy, @Polymorphism
+    * [HHH-15714] - deprecate FilterKey and QuerySpacesHelper
+    * [HHH-15701] - deprecated CacheModeType
+    * [HHH-15697] - deprecate lock(entityName,...)
+    * [HHH-15684] - SelectionQuery.setAliasSpecificLockMode() confusion
+    * [HHH-15680] - deprecate LockRequest and buildLockRequest(), and have lock() accept LockOptions
+    * [HHH-15676] - deprecate SessionFactory.getFilterDefinition()
+
+** Improvement
+    * [HHH-15926] - allow @Type and @CompositeType to be applied as meta-annotations
+    * [HHH-15919] - add trunc() / truncate() to the portable HQL functions
+    * [HHH-15912] - adaptive handling of DDL types for Java enums mapped as ORDINAL
+    * [HHH-15899] - Add @PartitionKey annotation
+    * [HHH-15898] - Add @Instantiator annotation to mark canonical constructor for embeddables
+    * [HHH-15887] - Avoid megamorphic calls on JdbcValuesSourceProcessingState#getSession
+    * [HHH-15886] - Micro optimisations in NavigableRole equals and hashcode
+    * [HHH-15879] - Introduce a fetchable key for Fetchable within FetchableContainer
+    * [HHH-15878] - Micro optimisations of StatefulPersistenceContext#clear
+
+
 Changes in 6.1.2.Final (August 03, 2022)
 ------------------------------------------------------------------------------------------------------------------------
 

ci/build.sh

@@ -18,9 +18,12 @@ elif [ "$RDBMS" == "postgresql" ] || [ "$RDBMS" == "postgresql_10" ]; then
   goal="-Pdb=pgsql_ci"
 elif [ "$RDBMS" == "edb" ] || [ "$RDBMS" == "edb_10" ]; then
   goal="-Pdb=edb_ci -DdbHost=localhost:5444"
-elif [ "$RDBMS" == "oracle" ] || [ "$RDBMS" == "oracle_11_2" ]; then
+elif [ "$RDBMS" == "oracle" ]; then
   # I have no idea why, but these tests don't seem to work on CI...
   goal="-Pdb=oracle_ci -PexcludeTests=**.LockTest.testQueryTimeout*"
+elif [ "$RDBMS" == "oracle_11_2" ]; then
+  # I have no idea why, but these tests don't seem to work on CI...
+  goal="-Pdb=oracle_legacy_ci -PexcludeTests=**.LockTest.testQueryTimeout*"
 elif [ "$RDBMS" == "db2" ]; then
   goal="-Pdb=db2_ci"
 elif [ "$RDBMS" == "db2_10_5" ]; then

ci/jpa-3.0-tck.Jenkinsfile

@@ -4,4 +4,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-jdbcDependency 'org.mariadb.jdbc:mariadb-java-client:2.2.4'
+jdbcDependency 'org.mariadb.jdbc:mariadb-java-client:2.7.7'

databases/mariadb/matrix.gradle

@@ -4,4 +4,4 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-jdbcDependency 'com.oracle.database.jdbc:ojdbc8:21.1.0.0'
+jdbcDependency 'com.oracle.database.jdbc:ojdbc8:21.8.0.0'