Skip to content

Commit 713fe69

Browse files
committed
Update travis config and update checkstyle config
1 parent a0c24f7 commit 713fe69

File tree

6 files changed

+17
-15
lines changed

6 files changed

+17
-15
lines changed

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# To let the CI execute the maven wrapper, use this command and push the change:
22
# git update-index --chmod=+x mvnw
33

4-
sudo: false # route your build to the container-based infrastructure for a faster build
54
language: java
6-
install: true
75
jdk:
86
- openjdk8
97

@@ -17,8 +15,8 @@ before_install:
1715
- tar xvf secrets.tar
1816

1917
script:
20-
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./mvnw clean install -Djarsigner.skip=true checkstyle:check; fi'
21-
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./mvnw clean install -Djarsigner.skip=false checkstyle:check; fi'
18+
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./mvnw clean install -Djarsigner.skip=true; fi'
19+
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./mvnw clean install -Djarsigner.skip=false; fi'
2220

2321
after_success:
2422
- ./mvnw test jacoco:report coveralls:report
@@ -31,14 +29,14 @@ deploy:
3129
branch: master
3230
tags: true
3331
- provider: releases
34-
api_key:
32+
token:
3533
secure: "ozRga/xe4pNZNH59tmPK1lLpCFa4WFW674JMTBWLbf+7zjPiN8K5dtAYUkhDqngw0ifasukVCRey4F9fu479KlFciGrLBd4r/hq/rh7inVHqd1qcn4AwyDX3EkbloD5qwfas7yn5zJ7cWm7KyEkfpr+fgReaQzSRvJUpjpDBrS2xNIYOhL1tInu84/RtyB6QuJjQOkH9rulP9M8gjcEH9Iu0k40jAVYLJDL9opOWrc9qpAzL0wN4xXGbnI30WrA8nmLcrHRxODOxbYEQ5EndLFJyS3nYxL9D3QJeEYkXf9uqz46V4dgfrEirWrtin3PlSUKTD9/0Mqz4uxqrGky0vrpha7m231+ilTUJzvE0a29LdS3R4A6ssDb0oFtj4pP3O6uNDqZN20r83ughGi0GrlKL/CGpQ4fS5nOpqppx0Xg+SR78/uOqQDIOn570FILBTKiaTsCn6xKqYC4QFSlsZiXojgU4FDZpKygH932qUDE0BnzsZEtzCube2oXMktZs6keSmELMyRYVs/K9yC7+8R1Pez1Xz72zxNG1ke6588sO3wxN+Q+0ZhqmQC8Y2OY8i72b06M5SyGz5TV38SrntLU88HOMWVJtfRDcMcPnJdFgaujZCoOw5SfokzXncipldfJGpKGIb3fHBMJw0MzspT7Kp6XRzSbtJI5+NVestR4="
3634
file_glob: true
3735
file:
3836
- "target/*.jar"
3937
- "target/*.sha256"
4038
- "target/checksum-sha256.txt"
41-
skip_cleanup: true
39+
cleanup: true
4240
on:
4341
branch: master
4442
tags: true

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This repo validates against checkstyle (import the xml found in the root to your
88
To run the tests (and checkstyle):
99

1010
```shell
11-
mvn test checkstyle:check
11+
mvn test
1212
```
1313

1414
Tests are automatically run against branches and pull requests

checkstyle.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@
3434
<module name="FileLength"><!-- max line length for single file: http://checkstyle.sourceforge.net/config_sizes.html#FileLength -->
3535
<property name="max" value="3500"/>
3636
</module>
37+
<module name="LineLength"><!-- max char length per line http://checkstyle.sourceforge.net/config_sizes.html#LineLength -->
38+
<property name="max" value="300"/>
39+
</module>
3740

3841
<module name="TreeWalker">
3942
<module name="SuppressionCommentFilter"/> <!-- use //CHECKSTYLE:OFF (...) //CHECKSTYLE:ON to disable checkstyle: http://checkstyle.sourceforge.net/config_filters.html#SuppressionCommentFilter -->
4043

4144
<!-- Annotations -->
4245
<module name="MissingDeprecated"> <!-- if @deprecated and javadoc is there, must be explained in javadoc: http://checkstyle.sourceforge.net/config_annotation.html#MissingDeprecated -->
43-
<property name="skipNoJavadoc" value="true"/>
4446
</module>
4547
<module name="MissingOverride"/> <!-- if has @inheritDoc in javadoc must have @Override http://checkstyle.sourceforge.net/config_annotation.html#MissingOverride -->
4648
<module name="PackageAnnotation"/> <!-- must only be in package-info: http://checkstyle.sourceforge.net/config_annotation.html#PackageAnnotation -->
@@ -107,9 +109,6 @@
107109
<module name="IllegalInstantiation"/> <!-- Must not use const of certain types (Activity, Fragment): http://checkstyle.sourceforge.net/config_coding.html#IllegalInstantiation -->
108110

109111
<!-- Size Limitiations -->
110-
<module name="LineLength"><!-- max char length per line http://checkstyle.sourceforge.net/config_sizes.html#LineLength -->
111-
<property name="max" value="300"/>
112-
</module>
113112
<module name="MethodLength"><!-- max line length for single method http://checkstyle.sourceforge.net/config_sizes.html#MethodLength -->
114113
<property name="max" value="150"/>
115114
</module>

pom.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,24 @@
6262
<plugin>
6363
<groupId>org.apache.maven.plugins</groupId>
6464
<artifactId>maven-checkstyle-plugin</artifactId>
65-
<version>3.0.0</version>
65+
<version>3.1.1</version>
6666
<configuration>
6767
<configLocation>checkstyle.xml</configLocation>
6868
<suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
6969
<suppressionsFileExpression>checkstyle.suppressions.file</suppressionsFileExpression>
7070
</configuration>
71+
<executions>
72+
<execution>
73+
<goals>
74+
<goal>check</goal>
75+
</goals>
76+
</execution>
77+
</executions>
7178
<dependencies>
7279
<dependency>
7380
<groupId>com.puppycrawl.tools</groupId>
7481
<artifactId>checkstyle</artifactId>
75-
<version>8.18</version>
82+
<version>8.31</version>
7683
</dependency>
7784
</dependencies>
7885
</plugin>

src/main/java/at/favre/lib/bytes/BytesValidators.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ public static BytesValidator noneOf(byte refByte) {
113113
return new BytesValidator.IdenticalContent(refByte, BytesValidator.IdenticalContent.Mode.NONE_OF);
114114
}
115115

116-
117116
/**
118117
* This will execute all passed validators and returns true if at least one returns true (i.e. OR concatenation)
119118
*

src/main/java/at/favre/lib/bytes/Util.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ static byte[] concat(byte[]... arrays) {
7272
return result;
7373
}
7474

75-
7675
/**
7776
* Combines a single argument with a vararg to a single array
7877
*

0 commit comments

Comments
 (0)