Skip to content

Commit

Permalink
googlejavaformat now requires Java 1.8+, so only try and format the c…
Browse files Browse the repository at this point in the history 
…ode if using a recent JDK.
  • Loading branch information
@bramp
bramp committed Apr 1, 2017
1 parent 13fa4c2 commit 4985ba3
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions pom.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -329,19 +329,6 @@
</configuration> </configuration>
</plugin> </plugin>


<plugin>
<!-- mvn com.coveo:fmt-maven-plugin:format -->
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
Expand Down Expand Up @@ -551,13 +538,26 @@


<profiles> <profiles>
<profile> <profile>
<id>errorprone</id> <!-- googlejavaformat and errorprone requires Java 8 -->
<id>java18</id>
<activation> <activation>
<!-- errorprone requires Java 8 -->
<jdk>1.8</jdk> <jdk>1.8</jdk>
</activation> </activation>
<build> <build>
<plugins> <plugins>
<plugin>
<!-- mvn com.coveo:fmt-maven-plugin:format -->
<groupId>com.coveo</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -567,7 +567,6 @@
<showWarnings>true</showWarnings> <showWarnings>true</showWarnings>
<compilerArgs> <compilerArgs>
<arg>-Xlint:all</arg> <arg>-Xlint:all</arg>
<!--arg>-Werror</arg-->
</compilerArgs> </compilerArgs>
</configuration> </configuration>
<dependencies> <dependencies>
Expand Down

0 comments on commit 4985ba3

Please sign in to comment.