HHH-14792 Remove support for bytecode enhancement via Javassist

Author: Sanne

documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/features.xml

@@ -60,7 +60,6 @@
     <bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
     <bundle>mvn:org.apache.logging.log4j/log4j-api/2.0</bundle>
     <bundle>mvn:org.jboss.logging/jboss-logging/3.2.1.Final</bundle>
-    <bundle>mvn:org.javassist/javassist/3.18.1-GA</bundle>
 
     <bundle>mvn:org.hibernate.common/hibernate-commons-annotations/4.0.5.Final</bundle>
 

documentation/src/main/asciidoc/quickstart/tutorials/osgi/managed-jpa/pom.xml

@@ -56,9 +56,6 @@
               org.apache.karaf.shell.console,
               org.apache.karaf.shell.commands,
               javax.persistence;version="[1.0.0,2.1.0]",
-              <!-- Needed for proxying's Javassist enhancement during runtime -->
-              org.hibernate.proxy,
-              javassist.util.proxy,
               *
             </Import-Package>
             <Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>

documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/features.xml

@@ -33,7 +33,6 @@
     <bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
     <bundle>mvn:org.apache.logging.log4j/log4j-api/2.0</bundle>
     <bundle>mvn:org.jboss.logging/jboss-logging/3.2.1.Final</bundle>
-    <bundle>mvn:org.javassist/javassist/3.18.1-GA</bundle>
 
     <bundle>mvn:org.hibernate.common/hibernate-commons-annotations/4.0.5.Final</bundle>
 

documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/pom.xml

@@ -68,9 +68,6 @@
               org.apache.karaf.shell.commands,
               org.h2,
               javax.persistence;version="[1.0.0,2.1.0]",
-              <!-- Needed for proxying's Javassist enhancement during runtime -->
-              org.hibernate.proxy,
-              javassist.util.proxy,
               *
             </Import-Package>
           </instructions>

documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/features.xml

@@ -41,7 +41,6 @@
     <bundle>mvn:com.fasterxml/classmate/0.8.0</bundle>
     <bundle>mvn:org.apache.logging.log4j/log4j-api/2.0</bundle>
     <bundle>mvn:org.jboss.logging/jboss-logging/3.2.1.Final</bundle>
-    <bundle>mvn:org.javassist/javassist/3.18.1-GA</bundle>
 
     <bundle>mvn:org.hibernate.common/hibernate-commons-annotations/4.0.5.Final</bundle>
 

documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/pom.xml

@@ -76,9 +76,6 @@
               org.hibernate.cfg,
               org.hibernate.service,
               javax.persistence;version="[1.0.0,2.1.0]",
-              <!-- Needed for proxy enhancement during runtime -->
-              org.hibernate.proxy,
-              javassist.util.proxy,
               *
             </Import-Package>
           </instructions>

documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc

@@ -434,7 +434,7 @@ Enable lazy loading feature in runtime bytecode enhancement. This way, even basi
 Enable association management feature in runtime bytecode enhancement which automatically synchronizes a bidirectional association when only one side is changed.
 
 `*hibernate.bytecode.provider*` (e.g. `bytebuddy` (default value))::
-The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/bytecode/spi/BytecodeProvider.html[`BytecodeProvider`] built-in implementation flavor. Currently, only `bytebuddy` and `javassist` are valid values; `bytebuddy` is the default and recommended choice; `javassist` will be removed soon.
+The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/bytecode/spi/BytecodeProvider.html[`BytecodeProvider`] built-in implementation flavor. Currently, only `bytebuddy` is a valid value, as older deprecated options have been removed.
 
 `*hibernate.bytecode.use_reflection_optimizer*` (e.g. `true` or `false` (default value))::
 Should we use reflection optimization? The reflection optimizer implements the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/bytecode/spi/ReflectionOptimizer.html[`ReflectionOptimizer`] interface and improves entity instantiation and property getter/setter calls.

documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc

@@ -455,10 +455,9 @@ Hibernate will trigger a Persistence Context flush if there are pending `Account
 ==== Define a custom entity proxy
 
 By default, when it needs to use a proxy instead of the actual POJO, Hibernate is going to use a Bytecode manipulation library like
-https://jboss-javassist.github.io/javassist/[Javassist] or
 https://bytebuddy.net/[Byte Buddy].
 
-However, if the entity class is final, Javassist will not create a proxy and you will get a POJO even when you only need a proxy reference.
+However, if the entity class is final, a proxy will not be created; you will get a POJO even when you only need a proxy reference.
 In this case, you could proxy an interface that this particular entity implements, as illustrated by the following example.
 
 [[entity-proxy-interface-mapping]]

documentation/src/main/asciidoc/userguide/chapters/osgi/OSGi.adoc

@@ -93,7 +93,6 @@ That `DataSource` is then used by your `persistence.xml` persistence-unit. The f
 Your bundle's manifest will need to import, at a minimum:
 
 * `javax.persistence`
-* `org.hibernate.proxy` and `javassist.util.proxy`, due to Hibernate's ability to return proxies for lazy initialization (Javassist enhancement occurs on the entity's `ClassLoader` during runtime).
 
 === Obtaining an EntityManger
 
@@ -123,7 +122,6 @@ Similar to any other JPA setup, your bundle must include a `persistence.xml` fil
 Your bundle's manifest will need to import, at a minimum:
 
 * `javax.persistence`
-* `org.hibernate.proxy` and `javassist.util.proxy`, due to Hibernate's ability to return proxies for lazy initialization (Javassist enhancement occurs on the entity's `ClassLoader` during runtime)
 * JDBC driver package (example: `org.h2`)
 * `org.osgi.framework`, necessary to discover the `EntityManagerFactory` (described below)
 
@@ -157,7 +155,6 @@ Native Hibernate use is also supported. The client bundle is responsible for man
 Your bundle's manifest will need to import, at a minimum:
 
 * `javax.persistence`
-* `org.hibernate.proxy` and `javassist.util.proxy`, due to Hibernate's ability to return proxies for lazy initialization (Javassist enhancement occurs on the entity's `ClassLoader` during runtime)
 * JDBC driver package (example: `org.h2`)
 * `org.osgi.framework`, necessary to discover the `SessionFactory` (described below)
 * `org.hibernate.*` packages, as necessary (ex: cfg, criterion, service, etc.)

gradle/java-module.gradle

@@ -72,7 +72,6 @@ dependencies {
 	testCompile( libraries.byteman_bmunit )
 
 	testRuntime( libraries.log4j2 )
-	testRuntime( libraries.javassist )
 	testRuntime( libraries.byteBuddy )
 
 	//Databases

gradle/libraries.gradle

@@ -24,7 +24,6 @@ ext {
     weldVersion = '3.1.5.Final'
     jakartaWeldVersion = '4.0.1.SP1'
 
-    javassistVersion = '3.27.0-GA'
     byteBuddyVersion = '1.11.12'
 
     agroalVersion = '1.9'
@@ -64,9 +63,6 @@ ext {
             // Dom4J
             dom4j:          'org.dom4j:dom4j:2.1.3@jar',
 
-            // Javassist
-            javassist:      "org.javassist:javassist:${javassistVersion}",
-
             // Byte Buddy
             byteBuddy:      "net.bytebuddy:byte-buddy:${byteBuddyVersion}",
 

hibernate-core-jakarta/hibernate-core-jakarta.gradle

@@ -20,8 +20,6 @@ configurations {
 
 dependencies {
 	compile( libraries.jakarta_jpa )
-	// This can now be made provided
-	compile( libraries.javassist )
 	// Could be made optional?
 	compile( libraries.byteBuddy )
 	compile( libraries.antlr )
@@ -75,7 +73,6 @@ dependencies {
 	testRuntime( "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final" )
 	testRuntime( libraries.jakarta_el )
 	testRuntime( 'jaxen:jaxen:1.1' )
-	testRuntime( libraries.javassist )
 	testRuntime( libraries.byteBuddy )
 	testRuntime( libraries.jakarta_weld )
 	testRuntime( libraries.atomikos )

hibernate-core/hibernate-core.gradle

@@ -28,31 +28,17 @@ sourceSets {
             setSrcDirs( ['src/test/java','src/test/resources','src/test/bundles'] )
         }
     }
-
-    testJavassist {
-        java {
-            compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + test.output
-        }
-    }
 }
 
 configurations {
     tests {
         description = 'Configuration for the produced test jar'
     }
-
-    //Configures the compile and runtime configurations for our javassist tests
-    //and includes the dependencies of the test task.
-    testJavassistCompile.extendsFrom testCompile
-    testJavassistRuntime.extendsFrom testRuntime
 }
 
 dependencies {
 
     compile( libraries.jpa )
-    // This can now be made provided
-    compile( libraries.javassist )
     // Could be made optional?
     compile( libraries.byteBuddy )
     compile( libraries.antlr )
@@ -103,7 +89,6 @@ dependencies {
     testRuntime( "org.jboss.spec.javax.ejb:jboss-ejb-api_3.2_spec:1.0.0.Final" )
     testRuntime( libraries.expression_language )
     testRuntime( 'jaxen:jaxen:1.1' )
-    testRuntime( libraries.javassist )
     testRuntime( libraries.byteBuddy )
     testRuntime( libraries.weld )
     testRuntime( libraries.atomikos )
@@ -118,9 +103,6 @@ dependencies {
     testCompile libraries.jboss_ejb_spec_jar
     testCompile libraries.jboss_annotation_spec_jar
 
-    // Additional tests requiring Javassist
-    // folder in src/javassist/java
-    testJavassistCompile libraries.javassist
 }
 
 jar {
@@ -265,35 +247,3 @@ test {
     }
 }
 
-//Create the task that runs the integration tests found from the
-//configured source directory and uses the correct classpath.
-task testJavassist(type: Test) {
-    testClassesDirs = sourceSets.testJavassist.output.classesDirs
-    classpath = sourceSets.testJavassist.runtimeClasspath
-    //If you want to ensure that integration tests are run every time when you invoke
-    //this task, uncomment the following line.
-    //outputs.upToDateWhen { false }
-
-    if ( gradle.ext.javaToolchainEnabled ) {
-        // Configure version of Java tools
-        javaLauncher = javaToolchains.launcherFor {
-            languageVersion = gradle.ext.javaVersions.test.launcher
-        }
-
-        //  Configure JVM Options
-        jvmArgs( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) )
-
-        // Display version of Java tools
-        doFirst {
-            logger.lifecycle "Testing javassist with '${javaLauncher.get().metadata.installationPath}'"
-        }
-    }
-
-    if ( gradle.ext.javaVersions.test.launcher.asInt() >= 9 ) {
-        // Javassist needs this to generate proxies
-        jvmArgs( ['--add-opens', 'java.base/java.lang=ALL-UNNAMED'] )
-    }
-}
-
-check.dependsOn testJavassist
-testJavassist.mustRunAfter test