Skip to content

Commit 4985ba3

Browse files
committed
googlejavaformat now requires Java 1.8+, so only try and format the code if using a recent JDK.
1 parent 13fa4c2 commit 4985ba3

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

Diff for: pom.xml

+15-16
Original file line numberDiff line numberDiff line change
@@ -329,19 +329,6 @@
329329
</configuration>
330330
</plugin>
331331

332-
<plugin>
333-
<!-- mvn com.coveo:fmt-maven-plugin:format -->
334-
<groupId>com.coveo</groupId>
335-
<artifactId>fmt-maven-plugin</artifactId>
336-
<executions>
337-
<execution>
338-
<goals>
339-
<goal>format</goal>
340-
</goals>
341-
</execution>
342-
</executions>
343-
</plugin>
344-
345332
<plugin>
346333
<groupId>org.apache.maven.plugins</groupId>
347334
<artifactId>maven-source-plugin</artifactId>
@@ -551,13 +538,26 @@
551538

552539
<profiles>
553540
<profile>
554-
<id>errorprone</id>
541+
<!-- googlejavaformat and errorprone requires Java 8 -->
542+
<id>java18</id>
555543
<activation>
556-
<!-- errorprone requires Java 8 -->
557544
<jdk>1.8</jdk>
558545
</activation>
559546
<build>
560547
<plugins>
548+
<plugin>
549+
<!-- mvn com.coveo:fmt-maven-plugin:format -->
550+
<groupId>com.coveo</groupId>
551+
<artifactId>fmt-maven-plugin</artifactId>
552+
<executions>
553+
<execution>
554+
<goals>
555+
<goal>format</goal>
556+
</goals>
557+
</execution>
558+
</executions>
559+
</plugin>
560+
561561
<plugin>
562562
<groupId>org.apache.maven.plugins</groupId>
563563
<artifactId>maven-compiler-plugin</artifactId>
@@ -567,7 +567,6 @@
567567
<showWarnings>true</showWarnings>
568568
<compilerArgs>
569569
<arg>-Xlint:all</arg>
570-
<!--arg>-Werror</arg-->
571570
</compilerArgs>
572571
</configuration>
573572
<dependencies>

0 commit comments

Comments
 (0)