Make cached return plugin independent of (extenral) class loader and …

…precompilation.
raphw · Nov 9, 2024 · e1d96f4 · e1d96f4
1 parent 6dff544
commit e1d96f4
Show file tree

Hide file tree

Showing 22 changed files with 255 additions and 638 deletions.
diff --git a/byte-buddy-dep/pom.xml b/byte-buddy-dep/pom.xml
@@ -382,6 +382,29 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>${version.plugin.resources}</version>
+                        <executions>
+                            <execution>
+                                <id>copy-advice-templates</id>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <phase>prepare-package</phase>
+                                <configuration>
+                                    <outputDirectory>${basedir}/target/destination-folder</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>src/main/precompiled-6</directory>
+                                            <filtering>false</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -593,18 +616,6 @@
                         <artifactId>build-helper-maven-plugin</artifactId>
                         <version>${version.plugin.buildhelper}</version>
                         <executions>
-                            <execution>
-                                <id>java-6-precompile</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/main/java-6</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
                             <execution>
                                 <id>java-6-precompile-test</id>
                                 <phase>generate-sources</phase>
@@ -624,20 +635,6 @@
                         <artifactId>maven-antrun-plugin</artifactId>
                         <version>${version.plugin.antrun}</version>
                         <executions>
-                            <execution>
-                                <id>java-6-precompile-copy</id>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <configuration>
-                                    <target>
-                                        <copy todir="${project.basedir}/src/main/precompiled-6">
-                                            <fileset dir="${project.build.outputDirectory}" includes="net/bytebuddy/build/CachedReturnPlugin$Advice$*.class" />
-                                        </copy>
-                                    </target>
-                                </configuration>
-                            </execution>
                             <execution>
                                 <id>java-6-precompile-test-copy</id>
                                 <phase>process-test-classes</phase>
@@ -666,11 +663,6 @@
                 </property>
             </activation>
             <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/precompiled-6</directory>
-                    </resource>
-                </resources>
                 <testResources>
                     <testResource>
                         <directory>src/test/precompiled-6</directory>

diff --git a/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$Object.java b/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$Object.java
diff --git a/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$boolean.java b/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$boolean.java
diff --git a/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$byte.java b/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$byte.java
diff --git a/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$char.java b/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$char.java
diff --git a/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$double.java b/byte-buddy-dep/src/main/java-6/net/bytebuddy/build/CachedReturnPlugin$Advice$double.java