Skip to content

Commit c4dc9b0

Browse files
committed
HHH-13704 Make javassist a compile time dependency again
This commit revert some of the changes so that we can release it in a micro without breaking application using Javassist. In the next minor it should be reverted.
1 parent 130945f commit c4dc9b0

File tree

5 files changed

+7
-34
lines changed

5 files changed

+7
-34
lines changed

hibernate-core/hibernate-core.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ configurations {
5151
dependencies {
5252

5353
compile( libraries.jpa )
54-
provided( libraries.javassist )
54+
// This can now be made provided
55+
compile( libraries.javassist )
5556
// Could be made optional?
5657
compile( libraries.byteBuddy )
5758
compile( libraries.antlr )

hibernate-core/src/test/java/org/hibernate/optional/javassist/OptionalJavassistDependencyTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

hibernate-envers/hibernate-envers.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ apply plugin: 'hibernate-matrix-testing'
1111
description = 'Hibernate\'s entity version (audit/history) support'
1212

1313
dependencies {
14-
compile( project( ':hibernate-core' ) )
14+
compile( project( ':hibernate-core' ) ) {
15+
// Exclude access to this to avoid future use.
16+
exclude group: "org.javassist", module: "javassist"
17+
}
18+
1519
provided( libraries.ant )
1620
annotationProcessor( project( ':hibernate-jpamodelgen' ) )
1721

hibernate-osgi/src/test/resources/org/hibernate/osgi/test/testing-bundles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
<features name="hibernate-osgi-testing-repository" xmlns='http://karaf.apache.org/xmlns/features/v1.2.0'>
88
<feature name='hibernate-osgi-testing' version='5.0.0-SNAPSHOT'>
99
<bundle>mvn:com.h2database/h2/1.3.170</bundle>
10-
<bundle>mvn:org.javassist/javassist/3.24.0-GA</bundle>
1110
</feature>
1211
</features>

migration-guide.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ earlier versions, see any other pertinent migration guides as well.
99

1010
== Known changes
1111

12-
=== Optional Javassist
13-
14-
Javassist is not a transitive dependency of Hibernate ORM core anymore. If you are using it in your
15-
project you will have to make sure to include it in the classpath of your application.
16-
1712
=== Overriding Delayed Identity Insert Behavior
1813

1914
In Hibernate 5.3, we added support for `DelayedPostInsertIdentifier` behavior to be influenced based on the

0 commit comments

Comments
 (0)