Skip to content

Commit e1d96f4

Browse files
committed
Make cached return plugin independent of (extenral) class loader and precompilation.
1 parent 6dff544 commit e1d96f4

22 files changed

+255
-638
lines changed

byte-buddy-dep/pom.xml

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,29 @@
382382
</execution>
383383
</executions>
384384
</plugin>
385+
<plugin>
386+
<groupId>org.apache.maven.plugins</groupId>
387+
<artifactId>maven-resources-plugin</artifactId>
388+
<version>${version.plugin.resources}</version>
389+
<executions>
390+
<execution>
391+
<id>copy-advice-templates</id>
392+
<goals>
393+
<goal>copy-resources</goal>
394+
</goals>
395+
<phase>prepare-package</phase>
396+
<configuration>
397+
<outputDirectory>${basedir}/target/destination-folder</outputDirectory>
398+
<resources>
399+
<resource>
400+
<directory>src/main/precompiled-6</directory>
401+
<filtering>false</filtering>
402+
</resource>
403+
</resources>
404+
</configuration>
405+
</execution>
406+
</executions>
407+
</plugin>
385408
</plugins>
386409
</build>
387410
</profile>
@@ -593,18 +616,6 @@
593616
<artifactId>build-helper-maven-plugin</artifactId>
594617
<version>${version.plugin.buildhelper}</version>
595618
<executions>
596-
<execution>
597-
<id>java-6-precompile</id>
598-
<phase>generate-sources</phase>
599-
<goals>
600-
<goal>add-source</goal>
601-
</goals>
602-
<configuration>
603-
<sources>
604-
<source>src/main/java-6</source>
605-
</sources>
606-
</configuration>
607-
</execution>
608619
<execution>
609620
<id>java-6-precompile-test</id>
610621
<phase>generate-sources</phase>
@@ -624,20 +635,6 @@
624635
<artifactId>maven-antrun-plugin</artifactId>
625636
<version>${version.plugin.antrun}</version>
626637
<executions>
627-
<execution>
628-
<id>java-6-precompile-copy</id>
629-
<phase>process-classes</phase>
630-
<goals>
631-
<goal>run</goal>
632-
</goals>
633-
<configuration>
634-
<target>
635-
<copy todir="${project.basedir}/src/main/precompiled-6">
636-
<fileset dir="${project.build.outputDirectory}" includes="net/bytebuddy/build/CachedReturnPlugin$Advice$*.class" />
637-
</copy>
638-
</target>
639-
</configuration>
640-
</execution>
641638
<execution>
642639
<id>java-6-precompile-test-copy</id>
643640
<phase>process-test-classes</phase>
@@ -666,11 +663,6 @@
666663
</property>
667664
</activation>
668665
<build>
669-
<resources>
670-
<resource>
671-
<directory>src/main/precompiled-6</directory>
672-
</resource>
673-
</resources>
674666
<testResources>
675667
<testResource>
676668
<directory>src/test/precompiled-6</directory>

byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$Object.java

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

byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$boolean.java

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

byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$byte.java

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

byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$char.java

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

byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$double.java

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

0 commit comments

Comments
 (0)