Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Add support for prettier-java v2.2.0 #94

Merged
merged 5 commits into from
Jul 21, 2023
Merged

Add support for prettier-java v2.2.0 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05920e4
Add support for prettier-java 2.2.0
jhaber Jul 21, 2023
47c6583
Remove legacy code
jhaber Jul 21, 2023
b53e96e
Switch to junit5 + testfactory
jhaber Jul 21, 2023
0df2577
Increase test timeout
jhaber Jul 21, 2023
2965909
Bump the timeout way up
jhaber Jul 21, 2023
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
21 changes: 3 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@
<version>2.11.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.9.3</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
Expand All @@ -115,19 +115,4 @@
</plugins>
</pluginManagement>
</build>

<profiles>
<profile>
<id>travis</id>
<activation>
<property>
<name>env.TRAVIS</name>
</property>
</activation>
<properties>
<basepom.test.reuse-vm>false</basepom.test.reuse-vm>
<basepom.test.fork-count>1</basepom.test.fork-count>
</properties>
</profile>
</profiles>
</project>
6 changes: 3 additions & 3 deletions prettier-maven-plugin-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<artifactId>prettier-maven-plugin-integration-tests</artifactId>

<properties>
<basepom.test.timeout>240</basepom.test.timeout>
<basepom.test.timeout>960</basepom.test.timeout>
</properties>

<dependencies>
Expand All @@ -21,8 +21,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 1 addition & 5 deletions ...tion-tests/src/test/java/com/hubspot/maven/plugins/prettier/AbstractPrettierMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public abstract class AbstractPrettierMojoTest {
protected static final String EMPTY = "empty/*.java";
protected static final String BUILD_SUCCESS = "BUILD SUCCESS";
protected static final String BUILD_FAILURE = "BUILD FAILURE";
private static final Set<String> PRETTIER_JAVA_VERSIONS_TO_TEST = ImmutableSet.of("1.6.2", "2.0.0");
private static final Set<String> PRETTIER_JAVA_VERSIONS_TO_TEST = ImmutableSet.of("1.6.2", "2.0.0", "2.2.0");

protected static Set<String> getPrettierJavaVersionsToTest() {
return PRETTIER_JAVA_VERSIONS_TO_TEST;
Expand Down Expand Up @@ -76,10 +76,6 @@ protected static MavenResult runMaven(TestConfiguration testConfiguration) throw
}
}

protected static boolean isNewishVersion(String prettierJavaVersion) {
return prettierJavaVersion.startsWith("1.");
}

protected static String reformattedFile(String pattern) {
return "Reformatted file: " + pattern.substring(0, pattern.indexOf('/'));
}
Expand Down
Loading
Loading