This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit 8544697a7169b82456c27b6dd60379f8f7704bcf Author: Gary Gregory <[email protected]> AuthorDate: Sun Sep 20 12:28:16 2020 -0400 Fix Checkstyle. Don't allow junk Javadocs. Use the POM default goal from CIs. --- .github/workflows/maven.yml | 3 +-- .travis.yml | 1 - checkstyle.xml | 10 ++++------ pom.xml | 1 + src/changes/changes.xml | 2 +- .../org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ebe35a7..26e7b03 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -43,5 +43,4 @@ jobs: with: java-version: ${{ matrix.java }} - name: Build with Maven - run: mvn --batch-mode apache-rat:check javadoc:javadoc -Ddoclint=all package --file pom.xml --no-transfer-progress -# run: mvn --batch-mode apache-rat:check package --file pom.xml + run: mvn --batch-mode -Ddoclint=all --file pom.xml --no-transfer-progress diff --git a/.travis.yml b/.travis.yml index 834887a..da0a1b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ language: java sudo: false -dist: trusty cache: directories: - $HOME/.m2 diff --git a/checkstyle.xml b/checkstyle.xml index ac652d4..bdc6f1e 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -48,6 +48,10 @@ limitations under the License. <property name="fileExtensions" value="java" /> </module> + <module name="LineLength"> + <property name="max" value="132"/> + </module> + <module name="TreeWalker"> <module name="AvoidStarImport"> <property name="excludes" value="org.junit.Assert"/> @@ -55,9 +59,6 @@ limitations under the License. <module name="RedundantImport"/> <module name="UnusedImports"/> <module name="NeedBraces"/> - <module name="LineLength"> - <property name="max" value="132"/> - </module> <!-- Modifier Checks --> <!-- See http://checkstyle.sf.net/config_modifiers.html --> @@ -75,10 +76,7 @@ limitations under the License. <module name="JavadocMethod"> <property name="scope" value="public"/> - <property name="allowUndeclaredRTE" value="true"/> - <property name="allowMissingJavadoc" value="true"/> <property name="allowMissingParamTags" value="true"/> - <property name="allowMissingThrowsTags" value="true"/> </module> <module name="SuppressionCommentFilter"/> diff --git a/pom.xml b/pom.xml index 6546d8b..1ac0f0d 100644 --- a/pom.xml +++ b/pom.xml @@ -107,6 +107,7 @@ Supported protocols include: Echo, Finger, FTP, NNTP, NTP, POP3(S), SMTP(S), Tel </dependencies> <build> + <defaultGoal>clean apache-rat:check javadoc:javadoc checkstyle:check clirr:check package</defaultGoal> <pluginManagement> <plugins> <!-- Allow CLI usage --> diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7b8a13b..d85b29c 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -65,7 +65,7 @@ The <action> type attribute can be add,update,fix,remove. <body> <release version="3.8" date="20YY-MM-DD" description="TBD"> <action issue="NET-687" type="fix" dev="ggregory" due-to="Gary Gregory, Mikael, j-verse"> - Update actions/checkout from v2.3.1 to v2.3.2 #56. + [FTPS] javax.net.ssl.SSLException: Unsupported or unrecognized SSL message, #59. </action> <!-- UPDATES --> <action issue="NET-673" type="fix" dev="ggregory" due-to="Dependabot"> diff --git a/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java b/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java index 60946b5..c24ca2c 100644 --- a/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java +++ b/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java @@ -60,7 +60,7 @@ public class MVSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl { * Volume Unit Referred Ext Used Recfm Lrecl BlkSz Dsorg Dsname * B10142 3390 2006/03/20 2 31 F 80 80 PS MDI.OKL.WORK * </pre> - * + * * @see <a href= * "https://www.ibm.com/support/knowledgecenter/zosbasics/com.ibm.zos.zconcepts/zconcepts_159.htm";>Data * set record formats</a>
