Skip to content
This repository was archived by the owner on Aug 11, 2021. It is now read-only.

Preparation for fixing reported checkstyle security vulnerability #1

Open
nwholloway wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Preparation for fixing reported checkstyle security vulnerability #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f5ef29
Update plugins to current version
nwholloway Oct 4, 2020
95f0270
Target JDK 11
nwholloway Oct 4, 2020
34917a4
Move Checkstyle LineLength check
nwholloway Oct 4, 2020
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
35 changes: 17 additions & 18 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,30 +89,29 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<version>3.1.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<!-- TODO: upgrade when MCOMPILER-205 fixed -->
<version>2.5.1</version>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<version>3.0.0-M1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<version>3.0.0-M3</version>
</plugin>

<plugin>
Expand All @@ -124,25 +123,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.4</version>
<version>3.0.0-M1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>3.2.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<version>3.2.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
<version>3.0.0-M1</version>
<configuration>
<tagNameFormat>@{project.version}</tagNameFormat>
</configuration>
Expand All @@ -151,31 +150,31 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<version>3.2.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.3</version>
<version>3.9.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>3.2.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<version>3.0.0-M5</version>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.6</version>
<version>1.6.8</version>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
Expand All @@ -200,10 +199,10 @@
<configuration>
<rules>
<requireJavaVersion>
<version>1.7.0-45</version>
<version>11.0</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.1.1</version>
<version>3.6.0</version>
</requireMavenVersion>
<requireNoRepositories />
<requirePluginVersions />
Expand Down
14 changes: 7 additions & 7 deletions src/main/resources/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@
<!-- Whitespace -->

<!-- <module name="FileTabCharacter"/> -->


<module name="LineLength">
<property name="ignorePattern" value="^import .*;$"/>
<property name="max" value="120"/>
</module>

<module name="TreeWalker">
<property name="tabWidth" value="4"/>

Expand Down Expand Up @@ -418,12 +423,7 @@
<!-- Size Violations -->

<module name="ExecutableStatementCount"/>

<module name="LineLength">
<property name="ignorePattern" value="^import .*;$"/>
<property name="max" value="120"/>
</module>


<module name="MethodLength"/>

<!-- <module name="AnonInnerLength"/> -->
Expand Down