Skip to content

Commit fb0957f

Browse files
committed
HHH-12321 Separate the Wildfly module for ByteByddy to make it private API
1 parent 8f670c5 commit fb0957f

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

hibernate-orm-modules/hibernate-orm-modules.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ ext {
3131

3232
// "10" for WildFly 10.x, "11" for 11.x, etc
3333
wildFlyMajorVersion = project.wildflyVersion.split( '\\.' )[0]
34+
bytebuddyVersion = project.byteBuddyVersion
3435
artifactClassifier = "wildfly-${wildFlyMajorVersion}-dist"
3536
wildFlyInstallDir = "$rootProject.buildDir/wildfly"
3637
fpackStagingDir = file( "target/featurepack" ) //Target build directory for the Feature Pack
@@ -70,6 +71,7 @@ featurepack {
7071
variables['slot'] = rootProject.hibernateVersion
7172
// Just the minor ORM version, e.g. "5.3"; Is used as an alias for the exact version
7273
variables['minorSlot'] = rootProject.hibernateMajorMinorVersion
74+
variables['bytebuddySlot'] = bytebuddyVersion
7375
//Dependency on another Feature Pack:
7476
dependency "org.wildfly:wildfly-feature-pack:${project.wildflyVersion}" // It will assume it is "zip" by default
7577
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Hibernate, Relational Persistence for Idiomatic Java
4+
~
5+
~ License: GNU Lesser General Public License (LGPL), version 2.1 or later.
6+
~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
7+
-->
8+
<module xmlns="urn:jboss:module:1.3" name="net.bytebuddy" slot="${bytebuddySlot}">
9+
<resources>
10+
<artifact name="${net.bytebuddy:byte-buddy}"/>
11+
</resources>
12+
</module>

hibernate-orm-modules/module-templates/hibernate-core.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<resources>
1010
<artifact name="${org.hibernate:hibernate-core}"/>
1111
<artifact name="${org.hibernate:hibernate-envers}"/>
12-
<artifact name="${net.bytebuddy:byte-buddy}"/>
1312
</resources>
1413

1514
<dependencies>
@@ -30,5 +29,6 @@
3029
<module name="org.javassist" export="true"/>
3130
<module name="org.hibernate.commons-annotations"/>
3231
<module name="org.hibernate.orm.jipijapa-hibernate5" services="import" slot="${slot}"/>
32+
<module name="net.bytebuddy" slot="${bytebuddySlot}" />
3333
</dependencies>
3434
</module>

0 commit comments

Comments
 (0)