Merge pull request #79 from jvz/blake3
CODEC-296: Add support for Blake3 family of hashes
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b3f1244..3846f9c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,11 +24,9 @@
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- java: [ 8, 11, 15 ]
+ java: [ 8, 11, 16 ]
experimental: [false]
include:
- - java: 16-ea
- experimental: true
- java: 17-ea
experimental: true
diff --git a/NOTICE.txt b/NOTICE.txt
index 9899d21..32257bc 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
Apache Commons Codec
-Copyright 2002-2020 The Apache Software Foundation
+Copyright 2002-2021 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index 71a0e6b..45869ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<commons.encoding>UTF-8</commons.encoding>
- <checkstyle.header.file>${basedir}/LICENSE-header.txt</checkstyle.header.file>
+ <checkstyle.header.file>${basedir}/src/conf/checkstyle-header.txt</checkstyle.header.file>
+ <checkstyle.config.file>${basedir}/src/conf/checkstyle.xml</checkstyle.config.file>
<checkstyle.version>2.17</checkstyle.version>
<commons.japicmp.version>0.15.2</commons.japicmp.version>
<commons.jacoco.version>0.8.6</commons.jacoco.version>
@@ -332,9 +333,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.version}</version>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>${checkstyle.config.file}</configLocation>
<enableRulesSummary>false</enableRulesSummary>
- <headerFile>${basedir}/LICENSE-header.txt</headerFile>
+ <headerFile>${checkstyle.header.file}</headerFile>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<resourceExcludes>NOTICE.txt,LICENSE.txt,**/pom.properties,**/sha512.properties</resourceExcludes>
</configuration>
@@ -368,9 +369,9 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.version}</version>
<configuration>
- <configLocation>${basedir}/checkstyle.xml</configLocation>
+ <configLocation>${checkstyle.config.file}</configLocation>
<enableRulesSummary>false</enableRulesSummary>
- <headerFile>${basedir}/LICENSE-header.txt</headerFile>
+ <headerFile>${checkstyle.header.file}</headerFile>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
<!-- We need to specify reportSets because 2.9.1 creates two reports -->
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index 4de79c3..431024d 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -24,9 +24,8 @@
<fileSets>
<fileSet>
<includes>
- <include>checkstyle*.xml</include>
+ <include>src/conf/*.*</include>
<include>LICENSE.txt</include>
- <include>LICENSE-header.txt</include>
<include>NOTICE.txt</include>
<include>pmd.xml</include>
<include>pom.xml</include>
diff --git a/LICENSE-header.txt b/src/conf/checkstyle-header.txt
similarity index 100%
rename from LICENSE-header.txt
rename to src/conf/checkstyle-header.txt
diff --git a/checkstyle-suppressions.xml b/src/conf/checkstyle-suppressions.xml
similarity index 100%
rename from checkstyle-suppressions.xml
rename to src/conf/checkstyle-suppressions.xml
diff --git a/checkstyle.xml b/src/conf/checkstyle.xml
similarity index 96%
rename from checkstyle.xml
rename to src/conf/checkstyle.xml
index d56696f..0d686a5 100644
--- a/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -25,7 +25,7 @@
<property name="localeLanguage" value="en" />
<module name="SuppressionFilter">
- <property name="file" value="checkstyle-suppressions.xml"/>
+ <property name="file" value="src/conf/checkstyle-suppressions.xml"/>
</module>
<!-- Checks whether files end with a new line. -->
