Skip to content

Commit 0c5f8dc

Browse files
malaportemalaporte
committed
Version 2.12
1 parent a844430 commit 0c5f8dc

File tree

22 files changed

+33
-38
lines changed

22 files changed

+33
-38
lines changed

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To have your sources automatically formatted on each build, add to your pom.xml:
2222
<plugin>
2323
<groupId>com.coveo</groupId>
2424
<artifactId>fmt-maven-plugin</artifactId>
25-
<version>2.11</version>
25+
<version>2.12</version>
2626
<executions>
2727
<execution>
2828
<goals>
@@ -43,7 +43,7 @@ If you prefer, you can only check formatting at build time using the `check` goa
4343
<plugin>
4444
<groupId>com.coveo</groupId>
4545
<artifactId>fmt-maven-plugin</artifactId>
46-
<version>2.11</version>
46+
<version>2.12</version>
4747
<executions>
4848
<execution>
4949
<goals>
@@ -81,7 +81,7 @@ example:
8181
<plugin>
8282
<groupId>com.coveo</groupId>
8383
<artifactId>fmt-maven-plugin</artifactId>
84-
<version>2.11</version>
84+
<version>2.12</version>
8585
<configuration>
8686
<sourceDirectory>some/source/directory</sourceDirectory>
8787
<testSourceDirectory>some/test/directory</testSourceDirectory>
@@ -124,7 +124,7 @@ example to not display the non-compliant files:
124124
<plugin>
125125
<groupId>com.coveo</groupId>
126126
<artifactId>fmt-maven-plugin</artifactId>
127-
<version>2.11</version>
127+
<version>2.12</version>
128128
<configuration>
129129
<displayFiles>false</displayFiles>
130130
</configuration>
@@ -147,7 +147,7 @@ example to limit the display up to 10 files
147147
<plugin>
148148
<groupId>com.coveo</groupId>
149149
<artifactId>fmt-maven-plugin</artifactId>
150-
<version>2.11</version>
150+
<version>2.12</version>
151151
<configuration>
152152
<displayLimit>10</displayLimit>
153153
</configuration>

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.coveo</groupId>
66
<artifactId>fmt-maven-plugin</artifactId>
7-
<version>2.11</version>
7+
<version>2.12</version>
88
<packaging>maven-plugin</packaging>
99

1010
<name>${project.groupId}:${project.artifactId}</name>
@@ -141,7 +141,7 @@
141141
<plugin>
142142
<groupId>com.coveo</groupId>
143143
<artifactId>fmt-maven-plugin</artifactId>
144-
<version>2.11</version>
144+
<version>2.12</version>
145145
<executions>
146146
<execution>
147147
<goals>

‎src/main/java/com/coveo/AbstractFMT.java

+7-12
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.google.common.base.Charsets;
44
import com.google.common.io.CharSource;
55
import com.google.googlejavaformat.java.*;
6-
76
import java.io.File;
87
import java.io.FileFilter;
98
import java.io.IOException;
@@ -23,17 +22,15 @@
2322
public abstract class AbstractFMT extends AbstractMojo {
2423

2524
@Parameter(
26-
defaultValue = "${project.build.sourceDirectory}",
27-
property = "sourceDirectory",
28-
required = true
29-
)
25+
defaultValue = "${project.build.sourceDirectory}",
26+
property = "sourceDirectory",
27+
required = true)
3028
private File sourceDirectory;
3129

3230
@Parameter(
33-
defaultValue = "${project.build.testSourceDirectory}",
34-
property = "testSourceDirectory",
35-
required = true
36-
)
31+
defaultValue = "${project.build.testSourceDirectory}",
32+
property = "testSourceDirectory",
33+
required = true)
3734
private File testSourceDirectory;
3835

3936
@Parameter(defaultValue = "${project.packaging}", required = true)
@@ -147,9 +144,7 @@ public void formatSourceFilesInDirectory(
147144
FileFilter fileNameFilter = getFileNameFilter();
148145
FileFilter pathFilter = getPathFilter();
149146
long failures =
150-
paths
151-
.collect(Collectors.toList())
152-
.parallelStream()
147+
paths.collect(Collectors.toList()).parallelStream()
153148
.filter(p -> p.toFile().exists())
154149
.map(Path::toFile)
155150
.filter(fileNameFilter::accept)

‎src/test/resources/additionalfolders/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<configuration>
2828
<additionalSourceDirectories>
2929
<directory>${project.basedir}/src/additionalfolder</directory>

‎src/test/resources/check_formatted/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/check_notformatted/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/check_notformatted_ignored/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<configuration>
2828
<filesPathPattern>^((?!\Wignored\W).)*\.java$</filesPathPattern>
2929
</configuration>

‎src/test/resources/failed_formatting/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/failonerrormissingsources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<configuration>
2828
<failOnUnknownFolder>true</failOnUnknownFolder>
2929
</configuration>

‎src/test/resources/failonerrorwithsources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<configuration>
2828
<failOnUnknownFolder>true</failOnUnknownFolder>
2929
</configuration>

‎src/test/resources/failonunknownstyle/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<configuration>
2828
<style>nope</style>
2929
</configuration>

‎src/test/resources/importunsorted/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/importunused/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/nosource/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/notestsource/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/onlyavajsources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<configuration>
2828
<additionalSourceDirectories>
2929
<directory>${project.basedir}/src/additionalfolder</directory>

‎src/test/resources/onlytestsources/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/simple/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/simple_aosp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<configuration>
2828
<style>aosp</style>
2929
</configuration>

‎src/test/resources/simple_google/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<configuration>
2828
<style>google</style>
2929
</configuration>

‎src/test/resources/validateonly_formatted/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

‎src/test/resources/validateonly_notformatted/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<plugin>
2424
<groupId>com.coveo</groupId>
2525
<artifactId>fmt-maven-plugin</artifactId>
26-
<version>2.11</version>
26+
<version>2.12</version>
2727
<executions>
2828
<execution>
2929
<goals>

0 commit comments

Comments
 (0)