aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pom.xml50
-rw-r--r--src/main/checkstyle/nanohttpd-style.xml3
2 files changed, 31 insertions, 22 deletions
diff --git a/pom.xml b/pom.xml
index 5a4ccbc..305b332 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,6 +209,15 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.13</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
+ <configuration>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
@@ -328,25 +337,6 @@
<exists>src/main/java</exists>
</file>
</activation>
- <build>
- <plugins>
- <plugin>
- <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
- <artifactId>maven-java-formatter-plugin</artifactId>
- <version>0.4</version>
- <executions>
- <execution>
- <goals>
- <goal>format</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <configFile>${project.basedir}/../src/main/formatter/formatter.xml</configFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
<reporting>
<plugins>
<plugin>
@@ -372,5 +362,27 @@
</plugins>
</reporting>
</profile>
+ <profile>
+ <id>format</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-java-formatter-plugin</groupId>
+ <artifactId>maven-java-formatter-plugin</artifactId>
+ <version>0.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <configFile>${project.basedir}/../src/main/formatter/formatter.xml</configFile>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/src/main/checkstyle/nanohttpd-style.xml b/src/main/checkstyle/nanohttpd-style.xml
index 8e2391b..f751504 100644
--- a/src/main/checkstyle/nanohttpd-style.xml
+++ b/src/main/checkstyle/nanohttpd-style.xml
@@ -123,9 +123,6 @@
</module>
<module name="IllegalInstantiation" />
<module name="InnerAssignment" />
- <module name="MagicNumber">
- <property name="ignoreAnnotation" value="true" />
- </module>
<module name="MissingSwitchDefault" />
<module name="RedundantThrows">