Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix eclipse jdt dep complexity by just using Roasters shaded / packaged version instead #119

Merged
merged 6 commits into from
Jul 9, 2022
Merged

Fix eclipse jdt dep complexity by just using Roasters shaded / packaged version instead #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f59bc1f
START: Use ecentral to fix map jdt releases
astubbs Jun 15, 2022
fea92a3
START: use Roaster's shaded eclipse compiler utils instead of trying …
astubbs Jun 15, 2022
3b7a509
JDT: remove eclipse / ecentral / JDT traces
astubbs Jun 16, 2022
91fab07
review
astubbs Jul 9, 2022
e4a10a1
Merge branch 'master' into fix-jdt-dep
astubbs Jul 9, 2022
6c6770d
Merge branch 'master' into fix-jdt-dep
astubbs Jul 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>io.stubbs.truth</groupId>
<artifactId>truth-generator-parent</artifactId>
Expand Down Expand Up @@ -132,11 +133,6 @@
<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>

<!-- Test -->
<dependency>
Expand All @@ -159,4 +155,5 @@
</plugin>
</plugins>
</build>

</project>
5 changes: 2 additions & 3 deletions generator/src/main/java/io/stubbs/truth/generator/internal/JDKOverrideAnalyser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<groupId>io.stubbs.truth</groupId>
<artifactId>truth-generator-parent</artifactId>
Expand All @@ -9,8 +10,7 @@
<packaging>pom</packaging>

<name>${project.name.root}</name>
<description>Code generator to create Subject files with both auto generated assertions methods and the ability to
maintain user created assertions using the Grandfather pattern.
<description>Code generator to create Subject files with both auto generated assertions methods and the ability to maintain user created assertions using the Grandfather pattern.
</description>
<url>github.com/astubbs/truth-generator</url>
<inceptionYear>2021</inceptionYear>
Expand Down Expand Up @@ -41,8 +41,8 @@
<url>https://github.com/astubbs/truth-generator.git</url>
<connection>scm:git:git://github.com:astubbs/truth-generator.git</connection>
<developerConnection>scm:git:git@github.com:astubbs/truth-generator.git</developerConnection>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>

<modules>
<module>generator-api</module>
Expand Down