diff --git a/jcstress-core/pom.xml b/jcstress-core/pom.xml
index 17a97e87..c3250f05 100644
--- a/jcstress-core/pom.xml
+++ b/jcstress-core/pom.xml
@@ -66,8 +66,8 @@ questions.
</configuration>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/CompileModeTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/CompileModeTest.java
index 327f2df8..98158ab4 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/CompileModeTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/CompileModeTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/AffinitySupportTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/AffinitySupportTest.java
index 1c4d9f59..bba26bfc 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/AffinitySupportTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/AffinitySupportTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os;
import org.junit.Assume;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerGlobalAffinityTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerGlobalAffinityTest.java
index 4aa88c0d..4fc0b0f7 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerGlobalAffinityTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerGlobalAffinityTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerLocalAffinityTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerLocalAffinityTest.java
index 61aef6fc..586250b4 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerLocalAffinityTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerLocalAffinityTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerNoneAffinityTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerNoneAffinityTest.java
index d3279222..d733364c 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerNoneAffinityTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerNoneAffinityTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerTest.java
index 427eb718..5d328cee 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulerTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulingClassInvariantsTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulingClassInvariantsTest.java
index 0c3fd731..33c6e6d2 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulingClassInvariantsTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/SchedulingClassInvariantsTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/AbstractTopologyTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/AbstractTopologyTest.java
index c9d89bdc..c5c025bb 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/AbstractTopologyTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/AbstractTopologyTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os.topology;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/FallbackTopologyTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/FallbackTopologyTest.java
index 604aaa5e..8be9c8c3 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/FallbackTopologyTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/FallbackTopologyTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os.topology;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/LinuxProcfsTopologyTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/LinuxProcfsTopologyTest.java
index e3f40f28..03ec88fb 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/LinuxProcfsTopologyTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/LinuxProcfsTopologyTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os.topology;
import org.junit.*;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/LinuxSysfsTopologyTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/LinuxSysfsTopologyTest.java
index 4004959d..723ef260 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/LinuxSysfsTopologyTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/LinuxSysfsTopologyTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os.topology;
import com.google.common.jimfs.Configuration;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/PresetTopologyTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/PresetTopologyTest.java
index b115e7e5..1e614164 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/PresetTopologyTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/os/topology/PresetTopologyTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2021, Red Hat, Inc. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.os.topology;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/util/ArrayUtilsTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/util/ArrayUtilsTest.java
index 8e0544df..c73c49f3 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/util/ArrayUtilsTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/util/ArrayUtilsTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2017, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.util;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/util/CounterTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/util/CounterTest.java
index ce060d7d..53b3a6e8 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/util/CounterTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/util/CounterTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.util;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/util/FileUtilsTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/util/FileUtilsTest.java
index c297ef03..c81bdddb 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/util/FileUtilsTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/util/FileUtilsTest.java
@@ -1,26 +1,50 @@
-package org.openjdk.jcstress.util;
-
-import org.junit.Test;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class FileUtilsTest {
-
- @Test
- public void testCopyFile() throws IOException {
- String tempFile = FileUtils.copyFileToTemp("/org/openjdk/jcstress/util/FileUtils.class", "fileutils", ".class");
-
- assertNotNull("File name returned", tempFile);
- assertTrue("File exists on disk", new File(tempFile).exists());
- }
-
- @Test(expected = IOException.class)
- public void testCopyFileThrowsNullPointerOnError() throws IOException {
- FileUtils.copyFileToTemp("/org/openjdk/jcstress/util/FileUtils.cl", "fileutils", ".class");
- }
-
+/*
+ * Copyright (c) 2017, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.openjdk.jcstress.util;
+
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class FileUtilsTest {
+
+ @Test
+ public void testCopyFile() throws IOException {
+ String tempFile = FileUtils.copyFileToTemp("/org/openjdk/jcstress/util/FileUtils.class", "fileutils", ".class");
+
+ assertNotNull("File name returned", tempFile);
+ assertTrue("File exists on disk", new File(tempFile).exists());
+ }
+
+ @Test(expected = IOException.class)
+ public void testCopyFileThrowsNullPointerOnError() throws IOException {
+ FileUtils.copyFileToTemp("/org/openjdk/jcstress/util/FileUtils.cl", "fileutils", ".class");
+ }
+
}
\ No newline at end of file
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/util/StringUtilsTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/util/StringUtilsTest.java
index 5d32ea5c..ea0f12eb 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/util/StringUtilsTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/util/StringUtilsTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.util;
import org.junit.Assert;
diff --git a/jcstress-core/src/test/java/org/openjdk/jcstress/util/TestLineTest.java b/jcstress-core/src/test/java/org/openjdk/jcstress/util/TestLineTest.java
index 5351e8fb..7561e33d 100644
--- a/jcstress-core/src/test/java/org/openjdk/jcstress/util/TestLineTest.java
+++ b/jcstress-core/src/test/java/org/openjdk/jcstress/util/TestLineTest.java
@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
package org.openjdk.jcstress.util;
import org.junit.Assert;
diff --git a/jcstress-result-gen/pom.xml b/jcstress-result-gen/pom.xml
index 0f50b2e5..7738dc19 100644
--- a/jcstress-result-gen/pom.xml
+++ b/jcstress-result-gen/pom.xml
@@ -50,8 +50,8 @@ questions.
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/jcstress-samples/pom.xml b/jcstress-samples/pom.xml
index 6e9d5411..9db43b4f 100644
--- a/jcstress-samples/pom.xml
+++ b/jcstress-samples/pom.xml
@@ -54,8 +54,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/jcstress-test-gen/pom.xml b/jcstress-test-gen/pom.xml
index 08054400..8923fd13 100644
--- a/jcstress-test-gen/pom.xml
+++ b/jcstress-test-gen/pom.xml
@@ -50,8 +50,8 @@ questions.
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index d2cf78e2..3ae40def 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,24 +113,29 @@ questions.
</executions>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.10.b1</version>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>4.1</version>
+ <configuration>
+ <licenseSets>
+ <licenseSet>
+ <header>file:///${project.basedir}/../src/license/gpl_cpe/header.txt</header>
+ <excludes>
+ <exclude>**/README</exclude>
+ <exclude>src/test/resources/**</exclude>
+ <exclude>src/main/resources/**</exclude>
+ </excludes>
+ </licenseSet>
+ </licenseSets>
+ <skipExistingHeaders>true</skipExistingHeaders>
+ <strictCheck>true</strictCheck>
+ </configuration>
<executions>
<execution>
<goals>
<goal>format</goal>
</goals>
<phase>process-sources</phase>
- <configuration>
- <header>file:///${project.basedir}/../src/license/gpl_cpe/header.txt</header>
- <skipExistingHeaders>true</skipExistingHeaders>
- <strictCheck>true</strictCheck>
- <basedir>${project.basedir}/src/main/</basedir>
- <mapping>
- <java>PHP</java>
- </mapping>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/tests-all/pom.xml b/tests-all/pom.xml
index 6af3ebd6..f6f6d16c 100644
--- a/tests-all/pom.xml
+++ b/tests-all/pom.xml
@@ -50,8 +50,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-0a/pom.xml b/tests-chapter-0a/pom.xml
index 8894300f..2d520515 100644
--- a/tests-chapter-0a/pom.xml
+++ b/tests-chapter-0a/pom.xml
@@ -94,8 +94,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-0b/pom.xml b/tests-chapter-0b/pom.xml
index 7598c022..e38d7cd4 100644
--- a/tests-chapter-0b/pom.xml
+++ b/tests-chapter-0b/pom.xml
@@ -100,8 +100,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-0c/pom.xml b/tests-chapter-0c/pom.xml
index 2bbadf14..540bd6e9 100644
--- a/tests-chapter-0c/pom.xml
+++ b/tests-chapter-0c/pom.xml
@@ -100,8 +100,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-0d/pom.xml b/tests-chapter-0d/pom.xml
index 118be0b4..2338ae15 100644
--- a/tests-chapter-0d/pom.xml
+++ b/tests-chapter-0d/pom.xml
@@ -53,8 +53,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-0e/pom.xml b/tests-chapter-0e/pom.xml
index 835ea449..8bcc97be 100644
--- a/tests-chapter-0e/pom.xml
+++ b/tests-chapter-0e/pom.xml
@@ -94,8 +94,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-1a/pom.xml b/tests-chapter-1a/pom.xml
index 8b0a0c92..50ad929e 100644
--- a/tests-chapter-1a/pom.xml
+++ b/tests-chapter-1a/pom.xml
@@ -100,8 +100,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-1b/pom.xml b/tests-chapter-1b/pom.xml
index d5b85b72..a1d9baf8 100644
--- a/tests-chapter-1b/pom.xml
+++ b/tests-chapter-1b/pom.xml
@@ -100,8 +100,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-1c/pom.xml b/tests-chapter-1c/pom.xml
index ff2be796..b883a256 100644
--- a/tests-chapter-1c/pom.xml
+++ b/tests-chapter-1c/pom.xml
@@ -100,8 +100,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-1d/pom.xml b/tests-chapter-1d/pom.xml
index a3f8bef4..05b60235 100644
--- a/tests-chapter-1d/pom.xml
+++ b/tests-chapter-1d/pom.xml
@@ -95,8 +95,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-2a/pom.xml b/tests-chapter-2a/pom.xml
index 299e846e..15b8d0b3 100644
--- a/tests-chapter-2a/pom.xml
+++ b/tests-chapter-2a/pom.xml
@@ -100,8 +100,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-chapter-2b/pom.xml b/tests-chapter-2b/pom.xml
index 21a18f93..12fc946f 100644
--- a/tests-chapter-2b/pom.xml
+++ b/tests-chapter-2b/pom.xml
@@ -101,8 +101,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/tests-custom/pom.xml b/tests-custom/pom.xml
index 457cedd7..62d6877c 100644
--- a/tests-custom/pom.xml
+++ b/tests-custom/pom.xml
@@ -54,8 +54,8 @@ questions.
<artifactId>maven-shade-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>