hamcrest · krichter722 · Aug 4, 2018
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 BSD License
 
-Copyright (c) 2000-2015 www.hamcrest.org
+Copyright (c) 2000-2022 www.hamcrest.org
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'signing'
+apply plugin: 'checkstyle'
 apply plugin: 'osgi'
 apply plugin: 'maven-publish'
 
@@ -21,10 +22,7 @@ subprojects {
 
     checkstyle {
 
-        project.ext.checkstyleVersion = '6.18'
-            //works with a JDK 7 version which is supposed to be supported although
-            //deprecated, see https://github.com/hamcrest/JavaHamcrest/pull/211 for
-            //the discussion about the support
+        project.ext.checkstyleVersion = '8.41'
 
         sourceSets = [ project.sourceSets.main, project.sourceSets.test ]
         ignoreFailures = false

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0"?>
  <!DOCTYPE module PUBLIC
-   "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-   "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+   "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+   "https://checkstyle.org/dtds/configuration_1_3.dtd">
 <module name="Checker">
     <!-- Checks that there are no tab characters ('\t') in the source code. -->
     <module name="FileTabCharacter">
         <!-- Report on each line in each file -->
         <property name="eachLine" value="true"/>
     </module>
+    <!-- Following interprets the header file as regular expressions. -->
+    <!-- Due to the fact that checkstyle only seems to be able to (re)use text from a license file if no text stands before the header in the source code and the fact that variable text is used in the header (package name), use the `RegexpHeader` module to validate the headers -->
+    <module name="RegexpHeader">
+        <property
+            name="header"
+            value="^/\*\*\n \* Copyright \(c\) 2000-2022 www.hamcrest.org. All rights reserved.\n \*\n \* This work is licensed under the terms of the BSD license.\n \* For a copy, see LICENSE.txt in this repository.\n\*/\n"/>
+        <property name="fileExtensions" value="java"/>
+    </module>
 </module>
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/HamcrestCoreIsDeprecated.java b/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/HamcrestCoreIsDeprecated.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.core.deprecated;
 
 /**

diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/package-info.java b/hamcrest-core/src/main/java/org/hamcrest/core/deprecated/package-info.java
@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
+
 /**
  * All classes in <code>hamcrest-core.jar</code> have been migrated to
  * <code>hamcrest.jar</code>. Please use that dependency instead.

diff --git a/hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java b/hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import org.hamcrest.integration.EasyMock2Adapter;

diff --git a/hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java b/hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import org.hamcrest.integration.JMock1Adapter;

diff --git a/hamcrest-integration/src/main/java/org/hamcrest/JavaLangMatcherAssert.java b/hamcrest-integration/src/main/java/org/hamcrest/JavaLangMatcherAssert.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 /**

diff --git a/hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java b/hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.integration;
 
 import org.easymock.IArgumentMatcher;

diff --git a/hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java b/hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.integration;
 
 import org.jmock.core.Constraint;

diff --git a/...st-library/src/main/java/org/hamcrest/library/deprecated/HamcrestLibraryIsDeprecated.java b/...st-library/src/main/java/org/hamcrest/library/deprecated/HamcrestLibraryIsDeprecated.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.library.deprecated;
 
 /**

diff --git a/hamcrest-library/src/main/java/org/hamcrest/library/deprecated/package-info.java b/hamcrest-library/src/main/java/org/hamcrest/library/deprecated/package-info.java
@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
+
 /**
  * All classes in <code>hamcrest-library.jar</code> have been migrated to
  * <code>hamcrest.jar</code>. Please use that dependency instead.

diff --git a/hamcrest/src/main/java/org/hamcrest/BaseDescription.java b/hamcrest/src/main/java/org/hamcrest/BaseDescription.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import org.hamcrest.internal.ArrayIterator;

diff --git a/hamcrest/src/main/java/org/hamcrest/BaseMatcher.java b/hamcrest/src/main/java/org/hamcrest/BaseMatcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 /**

diff --git a/hamcrest/src/main/java/org/hamcrest/Condition.java b/hamcrest/src/main/java/org/hamcrest/Condition.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 /**

diff --git a/hamcrest/src/main/java/org/hamcrest/CoreMatchers.java b/hamcrest/src/main/java/org/hamcrest/CoreMatchers.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import org.hamcrest.core.IsIterableContaining;

diff --git a/hamcrest/src/main/java/org/hamcrest/CustomMatcher.java b/hamcrest/src/main/java/org/hamcrest/CustomMatcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 /**

diff --git a/hamcrest/src/main/java/org/hamcrest/CustomTypeSafeMatcher.java b/hamcrest/src/main/java/org/hamcrest/CustomTypeSafeMatcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 

diff --git a/hamcrest/src/main/java/org/hamcrest/Description.java b/hamcrest/src/main/java/org/hamcrest/Description.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 /**

diff --git a/hamcrest/src/main/java/org/hamcrest/DiagnosingMatcher.java b/hamcrest/src/main/java/org/hamcrest/DiagnosingMatcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 /**

diff --git a/hamcrest/src/main/java/org/hamcrest/FeatureMatcher.java b/hamcrest/src/main/java/org/hamcrest/FeatureMatcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import org.hamcrest.internal.ReflectiveTypeFinder;

diff --git a/hamcrest/src/main/java/org/hamcrest/Matcher.java b/hamcrest/src/main/java/org/hamcrest/Matcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 /**

diff --git a/hamcrest/src/main/java/org/hamcrest/MatcherAssert.java b/hamcrest/src/main/java/org/hamcrest/MatcherAssert.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 

diff --git a/hamcrest/src/main/java/org/hamcrest/Matchers.java b/hamcrest/src/main/java/org/hamcrest/Matchers.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import org.hamcrest.collection.ArrayMatching;

diff --git a/hamcrest/src/main/java/org/hamcrest/SelfDescribing.java b/hamcrest/src/main/java/org/hamcrest/SelfDescribing.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 /**
@@ -13,4 +19,4 @@ public interface SelfDescribing {
      *     The description to be built or appended to.
      */
     void describeTo(Description description);
-}
+}
diff --git a/hamcrest/src/main/java/org/hamcrest/StringDescription.java b/hamcrest/src/main/java/org/hamcrest/StringDescription.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import java.io.IOException;

diff --git a/hamcrest/src/main/java/org/hamcrest/TypeSafeDiagnosingMatcher.java b/hamcrest/src/main/java/org/hamcrest/TypeSafeDiagnosingMatcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import org.hamcrest.internal.ReflectiveTypeFinder;

diff --git a/hamcrest/src/main/java/org/hamcrest/TypeSafeMatcher.java b/hamcrest/src/main/java/org/hamcrest/TypeSafeMatcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest;
 
 import org.hamcrest.internal.ReflectiveTypeFinder;

diff --git a/hamcrest/src/main/java/org/hamcrest/beans/HasProperty.java b/hamcrest/src/main/java/org/hamcrest/beans/HasProperty.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.beans;
 
 import org.hamcrest.Description;

diff --git a/hamcrest/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java b/hamcrest/src/main/java/org/hamcrest/beans/HasPropertyWithValue.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.beans;
 
 import org.hamcrest.Condition;

diff --git a/hamcrest/src/main/java/org/hamcrest/beans/PropertyUtil.java b/hamcrest/src/main/java/org/hamcrest/beans/PropertyUtil.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.beans;
 
 import java.beans.IntrospectionException;

diff --git a/hamcrest/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java b/hamcrest/src/main/java/org/hamcrest/beans/SamePropertyValuesAs.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.beans;
 
 import org.hamcrest.Description;

diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayAsIterableMatcher.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayAsIterableMatcher.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.collection;
 
 import org.hamcrest.Description;

diff --git a/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java b/hamcrest/src/main/java/org/hamcrest/collection/ArrayMatching.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.collection;
 
 import org.hamcrest.Matcher;

diff --git a/hamcrest/src/main/java/org/hamcrest/collection/HasItemInArray.java b/hamcrest/src/main/java/org/hamcrest/collection/HasItemInArray.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.collection;
 
 import org.hamcrest.Description;

diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArray.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArray.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.collection;
 
 import org.hamcrest.Description;

diff --git a/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java b/hamcrest/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
@@ -1,3 +1,9 @@
+/**
+ * Copyright (c) 2000-2022 www.hamcrest.org. All rights reserved.
+ *
+ * This work is licensed under the terms of the BSD license.
+ * For a copy, see LICENSE.txt in this repository.
+ */
 package org.hamcrest.collection;
 
 import org.hamcrest.Description;