Skip to content

Commit 1038198

Browse files
committed
HV-2150 Update Byte Buddy module in wildfly-preview 38.0.0.Final
to make things work with JDK 26 Signed-off-by: marko-bekhta <marko.prykladna@gmail.com>
1 parent 495428d commit 1038198

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

build/build-config/src/main/resources/setupModules.groovy

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,19 @@ jbossLoggingModuleXml = new File( wildflyPatchedTargetDir, 'modules/system/layer
6363
def jbossArtifactName = 'jboss-logging-' + jbossLoggingVersion + '.jar';
6464
println "[INFO] Using JBoss Logging version " + jbossArtifactName;
6565
processFileInplace( jbossLoggingModuleXml ) { text ->
66-
text.replaceAll( /jboss-logging.*jar/, jbossArtifactName )
66+
text.replaceAll( /jboss-logging.*jar/, jbossArtifactName )
6767
}
6868

6969
deleteFiles( new FileNameByRegexFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/org/jboss/logging/main', 'jboss-logging-.*\\.jar' ) )
7070

71+
// Byte Buddy
72+
byteBuddyModuleXml = new File( wildflyPatchedTargetDir, '/modules/system/layers/base/net/bytebuddy/main/module.xml' )
73+
def byteBuddyArtifactName = 'byte-buddy-' + byteBuddyVersion + '.jar';
74+
println "[INFO] Using Byte Buddy version " + byteBuddyArtifactName;
75+
processFileInplace( byteBuddyModuleXml ) { text ->
76+
text.replaceAll( /byte-buddy.*jar/, byteBuddyArtifactName )
77+
}
78+
79+
deleteFiles( new FileNameByRegexFinder().getFileNames( wildflyPatchedTargetDir + '/modules/system/layers/base/net/bytebuddy/main', 'byte-buddy-.*\\.jar' ) )
80+
7181
println "[INFO] ------------------------------------------------------------------------";

parents/internal/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,15 @@
137137
<outputDirectory>${wildfly.actual.target-dir}/modules/system/layers/base/org/jboss/logging/main</outputDirectory>
138138
<destFileName>jboss-logging-${version.org.jboss.logging.jboss-logging}.jar</destFileName>
139139
</artifactItem>
140+
<!-- And Byte Buddy -->
141+
<artifactItem>
142+
<groupId>net.bytebuddy</groupId>
143+
<artifactId>byte-buddy</artifactId>
144+
<version>${version.net.bytebuddy.byte-buddy}</version>
145+
<overWrite>false</overWrite>
146+
<outputDirectory>${wildfly.actual.target-dir}/modules/system/layers/base/net/bytebuddy/main</outputDirectory>
147+
<destFileName>byte-buddy-${version.net.bytebuddy.byte-buddy}.jar</destFileName>
148+
</artifactItem>
140149
</artifactItems>
141150
</configuration>
142151
</execution>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,6 +1284,7 @@
12841284
<properties>
12851285
<wildflyPatchedTargetDir>${wildfly.actual.target-dir}</wildflyPatchedTargetDir>
12861286
<jbossLoggingVersion>${version.org.jboss.logging.jboss-logging}</jbossLoggingVersion>
1287+
<byteBuddyVersion>${version.net.bytebuddy.byte-buddy}</byteBuddyVersion>
12871288
</properties>
12881289
</configuration>
12891290
</execution>

0 commit comments

Comments
 (0)