This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git
The following commit(s) were added to refs/heads/master by this push: new 21b697a Update to CP 51 21b697a is described below commit 21b697a44dff4e3290b648a337af8a2d6ca0e644 Author: Sebb <s...@apache.org> AuthorDate: Mon Jun 22 23:22:04 2020 +0100 Update to CP 51 --- checkstyle.xml | 23 +++++++++++------------ pom.xml | 19 ++++--------------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index a8e9ff9..ac652d4 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -49,7 +49,6 @@ limitations under the License. </module> <module name="TreeWalker"> - <property name="cacheFile" value="target/cachefile"/> <module name="AvoidStarImport"> <property name="excludes" value="org.junit.Assert"/> </module> @@ -82,24 +81,24 @@ limitations under the License. <property name="allowMissingThrowsTags" value="true"/> </module> - </module> + <module name="SuppressionCommentFilter"/> + + <!-- + Allow comment to suppress checkstyle for a single line + e.g. // CHECKSTYLE IGNORE MagicNumber + --> + <module name="SuppressWithNearbyCommentFilter"> + <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+)"/> + <property name="checkFormat" value="$1"/> + </module> - <module name="SuppressionCommentFilter"/> + </module> <module name="SuppressionFilter"> <!-- config_loc is used by Eclipse plugin --> <property name="file" value="${config_loc}/checkstyle-suppressions.xml"/> </module> - <!-- - Allow comment to suppress checkstyle for a single line - e.g. // CHECKSTYLE IGNORE MagicNumber - --> - <module name="SuppressWithNearbyCommentFilter"> - <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+)"/> - <property name="checkFormat" value="$1"/> - </module> - </module> diff --git a/pom.xml b/pom.xml index 66faaec..a8fc992 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.commons</groupId> <artifactId>commons-parent</artifactId> - <version>43</version> + <version>51</version> </parent> <groupId>commons-net</groupId> @@ -56,11 +56,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel <commons.release.desc>(Requires Java ${maven.compiler.target} or later)</commons.release.desc> <!-- Local version defines --> - <checkstyle.plugin.version>2.17</checkstyle.plugin.version> - <checkstyle.tool.version>6.9</checkstyle.tool.version> <commons.changes.onlyCurrentVersion>true</commons.changes.onlyCurrentVersion> - <!-- Temporary until CP51 --> - <commons.surefire.version>2.22.2</commons.surefire.version> </properties> <scm> @@ -116,14 +112,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> - <dependencies> - <dependency> - <groupId>com.puppycrawl.tools</groupId> - <artifactId>checkstyle</artifactId> - <version>${checkstyle.tool.version}</version> - </dependency> - </dependencies> + <version>${commons.checkstyle-plugin.version}</version> </plugin> </plugins> </pluginManagement> @@ -342,7 +331,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> + <version>${commons.checkstyle-plugin.version}</version> <configuration> <configLocation>${basedir}/checkstyle.xml</configLocation> <!-- Needed to define config_loc for use by Eclipse --> @@ -388,7 +377,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> + <version>${commons.checkstyle-plugin.version}</version> <configuration> <configLocation>${basedir}/checkstyle.xml</configLocation> <!-- Needed to define config_loc for use by Eclipse -->