START: use Roaster's shaded eclipse compiler utils instead of trying …

…to shade
astubbs · Jun 15, 2022 · fea92a3 · fea92a3
1 parent f59bc1f
commit fea92a3
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 8 deletions.
diff --git a/generator/pom.xml b/generator/pom.xml
@@ -133,11 +133,17 @@
             <version>1.2.11</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jdt</groupId>
-            <artifactId>org.eclipse.jdt.core</artifactId>
-            <version>3.29.0</version>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>org.eclipse.jdt</groupId>-->
+        <!--            <artifactId>org.eclipse.jdt.core</artifactId>-->
+        <!--            <version>3.29.0</version>-->
+        <!--            <exclusions>-->
+        <!--                <exclusion>-->
+        <!--                    <groupId>*</groupId>-->
+        <!--                    <artifactId>*</artifactId>-->
+        <!--                </exclusion>-->
+        <!--            </exclusions>-->
+        <!--        </dependency>-->
 
         <!-- Test -->
         <dependency>
@@ -161,6 +167,41 @@
 
     <build>
         <plugins>
+            <!--            <plugin>-->
+            <!--                <groupId>org.apache.maven.plugins</groupId>-->
+            <!--                <artifactId>maven-shade-plugin</artifactId>-->
+            <!--                <version>3.3.0</version>-->
+            <!--                <configuration>-->
+            <!--                    <artifactSet>-->
+            <!--                        <includes>-->
+            <!--                            <include>org.eclipse.jdt:org.eclipse.jdt.core</include>-->
+            <!--                        </includes>-->
+            <!--                        &lt;!&ndash;                        <excludes>&ndash;&gt;-->
+            <!--                        &lt;!&ndash;                            <exclude>*:maven-core</exclude>&ndash;&gt;-->
+            <!--                        &lt;!&ndash;                        </excludes>&ndash;&gt;-->
+            <!--                    </artifactSet>-->
+            <!--                    <filters>-->
+            <!--                        <filter>-->
+            <!--                            <artifact>org.eclipse.jdt:org.eclipse.jdt.core</artifact>-->
+            <!--                            <includes>-->
+            <!--                                <include>org/eclipse/jdt/internal/compiler/util/CtSym</include>-->
+            <!--                                &lt;!&ndash;                                <include>org/eclipse/jdt/internal/compiler/util/JRTUtil</include>&ndash;&gt;-->
+            <!--                            </includes>-->
+            <!--                            <excludes>-->
+            <!--                                <exclude>**</exclude>-->
+            <!--                            </excludes>-->
+            <!--                        </filter>-->
+            <!--                    </filters>-->
+            <!--                </configuration>-->
+            <!--                <executions>-->
+            <!--                    <execution>-->
+            <!--                        <phase>package</phase>-->
+            <!--                        <goals>-->
+            <!--                            <goal>shade</goal>-->
+            <!--                        </goals>-->
+            <!--                    </execution>-->
+            <!--                </executions>-->
+            <!--            </plugin>-->
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <executions>

diff --git a/generator/src/main/java/io/stubbs/truth/generator/internal/JDKOverrideAnalyser.java b/generator/src/main/java/io/stubbs/truth/generator/internal/JDKOverrideAnalyser.java
@@ -9,8 +9,8 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
-import org.eclipse.jdt.internal.compiler.util.CtSym;
-import org.eclipse.jdt.internal.compiler.util.JRTUtil;
+import org.jboss.forge.roaster._shade.org.eclipse.jdt.internal.compiler.util.CtSym;
+import org.jboss.forge.roaster._shade.org.eclipse.jdt.internal.compiler.util.JRTUtil;
 
 import javax.annotation.Nullable;
 import java.io.ByteArrayInputStream;
@@ -22,7 +22,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import java.util.stream.Stream;
 
 import static io.stubbs.truth.generator.internal.Utils.msg;