Repository: commons-crypto Updated Branches: refs/heads/master 2b6984939 -> ec4150fe3
Clean up a few build warnings. - remove references to the javancss plugin - clear up javadoc warnings from checkstyle by only requiring them for methods that are protected (or more visible) - remove an unused import Closes #86 Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/ec4150fe Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/ec4150fe Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/ec4150fe Branch: refs/heads/master Commit: ec4150fe30ceb9726618e60d6557a85cc122d77b Parents: 2b69849 Author: Marcelo Vanzin <van...@cloudera.com> Authored: Mon Oct 1 18:12:13 2018 -0700 Committer: Marcelo Vanzin <van...@cloudera.com> Committed: Tue Oct 2 09:57:04 2018 -0700 ---------------------------------------------------------------------- checkstyle.xml | 1 + pom.xml | 13 +------------ .../apache/commons/crypto/cipher/OpenSslCipher.java | 1 - .../commons/crypto/cipher/OpenSslCommonMode.java | 2 +- .../commons/crypto/cipher/OpenSslEvpCtrlValues.java | 2 +- 5 files changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/ec4150fe/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle.xml b/checkstyle.xml index 796ec19..5661e3a 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -38,6 +38,7 @@ limitations under the License. <module name="NeedBraces"/> <module name="JavadocMethod"> <property name="allowUndeclaredRTE" value="true"/> + <property name="scope" value="protected"/> </module> </module> </module> http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/ec4150fe/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bb23e3d..ea791a1 100644 --- a/pom.xml +++ b/pom.xml @@ -560,6 +560,7 @@ The following provides more details on the included cryptographic software: <configuration> <configLocation>${basedir}/checkstyle.xml</configLocation> <enableRulesSummary>false</enableRulesSummary> + <failsOnError>true</failsOnError> </configuration> <reportSets> <reportSet> @@ -632,11 +633,6 @@ The following provides more details on the included cryptographic software: </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javancss-maven-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> @@ -649,13 +645,6 @@ The following provides more details on the included cryptographic software: </excludes> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javancss-maven-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> </plugins> </reporting> <dependencies> http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/ec4150fe/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java index c62d58b..aa0dfd2 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java +++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java @@ -28,7 +28,6 @@ import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.ShortBufferException; -import javax.crypto.spec.IvParameterSpec; import org.apache.commons.crypto.utils.Utils; http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/ec4150fe/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java index f602d11..91475fc 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java +++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java @@ -32,7 +32,7 @@ import java.security.spec.AlgorithmParameterSpec; */ class OpenSslCommonMode extends OpenSslFeedbackCipher { - public OpenSslCommonMode(long context, int algorithmMode, int padding) { + OpenSslCommonMode(long context, int algorithmMode, int padding) { super(context, algorithmMode, padding); } http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/ec4150fe/src/main/java/org/apache/commons/crypto/cipher/OpenSslEvpCtrlValues.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSslEvpCtrlValues.java b/src/main/java/org/apache/commons/crypto/cipher/OpenSslEvpCtrlValues.java index 2b64ff5..f826af9 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslEvpCtrlValues.java +++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSslEvpCtrlValues.java @@ -46,7 +46,7 @@ enum OpenSslEvpCtrlValues { this.value = value; } - public int getValue() { + int getValue() { return value; } }
