Skip to content

Commit 47a395b

Browse files
committed
Fix build for JDK 7/8.
1 parent e301baa commit 47a395b

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

byte-buddy-dep/src/main/java/net/bytebuddy/utility/AsmClassWriter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ public AsmClassWriter make(int flags, AsmClassReader classReader, TypePool typeP
200200
FACTORY = processor == null ? Default.ASM_FIRST : Default.valueOf(processor);
201201
Class<?> type;
202202
try {
203-
type = Class.forName("codes.rafael.asmjdkbridge.JdkClassReader");
203+
type = ClassFileVersion.ofThisVm().isAtLeast(ClassFileVersion.JAVA_V24)
204+
? Class.forName("codes.rafael.asmjdkbridge.JdkClassReader")
205+
: null;
204206
} catch (ClassNotFoundException ignored) {
205207
type = null;
206208
}

byte-buddy/pom.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -373,16 +373,15 @@
373373
<relocation>
374374
<pattern>${shade.asm.source}</pattern>
375375
<shadedPattern>${shade.asm.target}</shadedPattern>
376-
<includes>
377-
<include>org.ow2.asm:*</include>
378-
</includes>
379376
</relocation>
380377
<relocation>
381378
<pattern>${shade.asmjdkbridge.source}</pattern>
382379
<shadedPattern>${shade.asmjdkbridge.target}</shadedPattern>
383-
<includes>
384-
<include>codes.rafael.asmjdkbridge:*</include>
385-
</includes>
380+
</relocation>
381+
<relocation>
382+
<pattern>codes/rafael/asmjdkbridge</pattern>
383+
<shadedPattern>net/bytebuddy/jar/asmjdkbridge</shadedPattern>
384+
<rawString>true</rawString>
386385
</relocation>
387386
</relocations>
388387
<filters>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
<version>${version.plugin.surefire}</version>
345345
<configuration>
346346
<argLine>${surefire.arguments}</argLine>
347+
<trimStackTrace>false</trimStackTrace>
347348
<systemPropertyVariables>
348349
<net.bytebuddy.experimental>${bytebuddy.experimental}</net.bytebuddy.experimental>
349350
<net.bytebuddy.test.integration>${bytebuddy.integration}</net.bytebuddy.test.integration>

0 commit comments

Comments
 (0)